From 7842b0f2d2ea69c7fc0da43c4fa17377adab0ac7 Mon Sep 17 00:00:00 2001 From: Rohit Ramkumar Date: Wed, 14 Mar 2018 13:49:57 -0700 Subject: [PATCH] Cleanup some unused files --- ingress-app.yaml | 105 ---- rc.yaml | 83 ---- tests/manifests/configuration-a.json | 689 --------------------------- tests/manifests/configuration-b.json | 689 --------------------------- tests/manifests/configuration-c.json | 261 ---------- 5 files changed, 1827 deletions(-) delete mode 100644 ingress-app.yaml delete mode 100644 rc.yaml delete mode 100644 tests/manifests/configuration-a.json delete mode 100644 tests/manifests/configuration-b.json delete mode 100644 tests/manifests/configuration-c.json diff --git a/ingress-app.yaml b/ingress-app.yaml deleted file mode 100644 index b9b3ade516..0000000000 --- a/ingress-app.yaml +++ /dev/null @@ -1,105 +0,0 @@ -# This Service writes the HTTP request headers out to the response. Access it -# through its NodePort, LoadBalancer or Ingress endpoint. -apiVersion: v1 -kind: Service -metadata: - name: echoheadersx - labels: - app: echoheaders -spec: - type: NodePort - ports: - - port: 80 - nodePort: 30301 - targetPort: 8080 - protocol: TCP - name: http - selector: - app: echoheaders ---- -apiVersion: v1 -kind: Service -metadata: - name: echoheadersy - labels: - app: echoheaders -spec: - type: NodePort - ports: - - port: 80 - nodePort: 30284 - targetPort: 8080 - protocol: TCP - name: http - selector: - app: echoheaders ---- -# This is a replication controller for the endpoint that services the 3 -# Services above. -apiVersion: v1 -kind: ReplicationController -metadata: - name: echoheaders -spec: - replicas: 1 - template: - metadata: - labels: - app: echoheaders - spec: - containers: - - name: echoheaders - image: gcr.io/google_containers/echoserver:1.8 - ports: - - containerPort: 8080 - env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - ---- -# This is the Ingress resource that creates a HTTP Loadbalancer configured -# according to the Ingress rules. -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: echomap -spec: - backend: - # Re-use echoheadersx as the default backend so we stay under the default - # quota for gce BackendServices. - serviceName: echoheadersx - servicePort: 80 - rules: - - host: foo.bar.com - http: - paths: - - path: /foo - backend: - serviceName: echoheadersx - servicePort: 80 - - host: bar.baz.com - http: - paths: - - path: /bar - backend: - serviceName: echoheadersy - servicePort: 80 - - path: /foo - backend: - serviceName: echoheadersx - servicePort: 80 - diff --git a/rc.yaml b/rc.yaml deleted file mode 100644 index 163ae62685..0000000000 --- a/rc.yaml +++ /dev/null @@ -1,83 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - # This must match the --default-backend-service argument of the l7 lb - # controller and is required because GCE mandates a default backend. - name: default-http-backend - labels: - k8s-app: glbc -spec: - # The default backend must be of type NodePort. - type: NodePort - ports: - - port: 80 - targetPort: 8080 - protocol: TCP - name: http - selector: - k8s-app: glbc - ---- -apiVersion: v1 -kind: ReplicationController -metadata: - name: l7-lb-controller - labels: - k8s-app: glbc - version: v0.9.7 -spec: - # There should never be more than 1 controller alive simultaneously. - replicas: 1 - selector: - k8s-app: glbc - version: v0.9.7 - template: - metadata: - labels: - k8s-app: glbc - version: v0.9.7 - name: glbc - spec: - terminationGracePeriodSeconds: 600 - containers: - - name: default-http-backend - # Any image is permissable as long as: - # 1. It serves a 404 page at / - # 2. It serves 200 on a /healthz endpoint - image: gcr.io/google_containers/defaultbackend:1.0 - livenessProbe: - httpGet: - path: /healthz - port: 8080 - scheme: HTTP - initialDelaySeconds: 30 - timeoutSeconds: 5 - ports: - - containerPort: 8080 - resources: - limits: - cpu: 10m - memory: 20Mi - requests: - cpu: 10m - memory: 20Mi - - image: gcr.io/google_containers/glbc:0.9.7 - livenessProbe: - httpGet: - path: /healthz - port: 8081 - scheme: HTTP - initialDelaySeconds: 30 - timeoutSeconds: 5 - name: l7-lb-controller - resources: - limits: - cpu: 100m - memory: 100Mi - requests: - cpu: 100m - memory: 50Mi - args: - - --apiserver-host=http://localhost:8080 - - --default-backend-service=default/default-http-backend - - --sync-period=300s diff --git a/tests/manifests/configuration-a.json b/tests/manifests/configuration-a.json deleted file mode 100644 index c9ec72a2dd..0000000000 --- a/tests/manifests/configuration-a.json +++ /dev/null @@ -1,689 +0,0 @@ -{ - "backends": [{ - "name": "upstream-default-backend", - "service": { - "metadata": { - "name": "default-http-backend", - "namespace": "kube-system", - "selfLink": "/api/v1/namespaces/kube-system/services/default-http-backend", - "uid": "907dc7db-5178-11e7-b3db-080027494b5d", - "resourceVersion": "3249707", - "creationTimestamp": "2017-06-15T03:13:12Z", - "labels": { - "k8s-app": "default-http-backend" - } - }, - "spec": { - "ports": [{ - "protocol": "TCP", - "port": 80, - "targetPort": 80 - }], - "selector": { - "k8s-app": "default-http-backend" - }, - "clusterIP": "10.0.0.131", - "type": "ClusterIP", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 0, - "secure": false, - "secureCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "sslPassthrough": false, - "endpoints": [{ - "address": "172.17.0.3", - "port": "80", - "maxFails": 0, - "failTimeout": 0, - "target": { - "kind": "Pod", - "namespace": "kube-system", - "name": "default-http-backend-3371703669-4dfnt", - "uid": "72e9c21f-793e-11e7-ac58-080027494b5d", - "resourceVersion": "3700969" - } - }], - "sessionAffinityConfig": { - "name": "", - "cookieSessionAffinity": { - "name": "", - "hash": "" - } - } - }, { - "name": "default-http-svc-80", - "service": { - "metadata": { - "name": "http-svc", - "namespace": "default", - "selfLink": "/api/v1/namespaces/default/services/http-svc", - "uid": "88b3c8a8-517e-11e7-b3db-080027494b5d", - "resourceVersion": "4242", - "creationTimestamp": "2017-06-15T03:55:55Z", - "labels": { - "app": "http-svc" - } - }, - "spec": { - "ports": [{ - "name": "http", - "protocol": "TCP", - "port": 80, - "targetPort": 8080, - "nodePort": 30301 - }], - "selector": { - "app": "http-svc" - }, - "clusterIP": "10.0.0.224", - "type": "NodePort", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 80, - "secure": false, - "secureCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "sslPassthrough": false, - "endpoints": [{ - "address": "172.17.0.2", - "port": "8080", - "maxFails": 0, - "failTimeout": 0, - "target": { - "kind": "Pod", - "namespace": "default", - "name": "http-svc-w088k", - "uid": "283a4361-7c7c-11e7-b124-080027494b5d", - "resourceVersion": "3700943" - } - }, { - "address": "172.17.0.5", - "port": "8080", - "maxFails": 0, - "failTimeout": 0, - "target": { - "kind": "Pod", - "namespace": "default", - "name": "http-svc-tp758", - "uid": "43a82d6e-7303-11e7-ac58-080027494b5d", - "resourceVersion": "3700959" - } - }], - "sessionAffinityConfig": { - "name": "", - "cookieSessionAffinity": { - "name": "", - "hash": "" - } - } - }, { - "name": "kube-system-kubernetes-dashboard-80", - "service": { - "metadata": { - "name": "kubernetes-dashboard", - "namespace": "kube-system", - "selfLink": "/api/v1/namespaces/kube-system/services/kubernetes-dashboard", - "uid": "b957713f-5176-11e7-b3db-080027494b5d", - "resourceVersion": "82", - "creationTimestamp": "2017-06-15T03:00:01Z", - "labels": { - "addonmanager.kubernetes.io/mode": "Reconcile", - "app": "kubernetes-dashboard", - "kubernetes.io/minikube-addons": "dashboard", - "kubernetes.io/minikube-addons-endpoint": "dashboard" - }, - "annotations": { - "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"annotations\":{},\"labels\":{\"addonmanager.kubernetes.io/mode\":\"Reconcile\",\"app\":\"kubernetes-dashboard\",\"kubernetes.io/minikube-addons\":\"dashboard\",\"kubernetes.io/minikube-addons-endpoint\":\"dashboard\"},\"name\":\"kubernetes-dashboard\",\"namespace\":\"kube-system\"},\"spec\":{\"ports\":[{\"nodePort\":30000,\"port\":80,\"targetPort\":9090}],\"selector\":{\"app\":\"kubernetes-dashboard\"},\"type\":\"NodePort\"}}\n" - } - }, - "spec": { - "ports": [{ - "protocol": "TCP", - "port": 80, - "targetPort": 9090, - "nodePort": 30000 - }], - "selector": { - "app": "kubernetes-dashboard" - }, - "clusterIP": "10.0.0.120", - "type": "NodePort", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 80, - "secure": false, - "secureCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "sslPassthrough": false, - "endpoints": [{ - "address": "172.17.0.6", - "port": "9090", - "maxFails": 0, - "failTimeout": 0, - "target": { - "kind": "Pod", - "namespace": "kube-system", - "name": "kubernetes-dashboard-m3qc0", - "uid": "b9511631-5176-11e7-b3db-080027494b5d", - "resourceVersion": "3700964" - } - }], - "sessionAffinityConfig": { - "name": "", - "cookieSessionAffinity": { - "name": "", - "hash": "" - } - } - }], - "servers": [{ - "hostname": "_", - "sslPassthrough": false, - "sslCertificate": "/ingress-controller/ssl/default-fake-certificate.pem", - "sslExpireTime": "0001-01-01T00:00:00Z", - "sslPemChecksum": "84d4ecb651dae44d625531bf77b6265d660b60b2", - "locations": [{ - "path": "/", - "isDefBackend": true, - "backend": "upstream-default-backend", - "service": { - "metadata": { - "name": "default-http-backend", - "namespace": "kube-system", - "selfLink": "/api/v1/namespaces/kube-system/services/default-http-backend", - "uid": "907dc7db-5178-11e7-b3db-080027494b5d", - "resourceVersion": "3249707", - "creationTimestamp": "2017-06-15T03:13:12Z", - "labels": { - "k8s-app": "default-http-backend" - } - }, - "spec": { - "ports": [{ - "protocol": "TCP", - "port": 80, - "targetPort": 80 - }], - "selector": { - "k8s-app": "default-http-backend" - }, - "clusterIP": "10.0.0.131", - "type": "ClusterIP", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 0, - "basicDigestAuth": { - "type": "", - "realm": "", - "file": "", - "secured": false, - "fileSha": "" - }, - "externalAuth": { - "url": "", - "host": "", - "signinUrl": "", - "method": "", - "sendBody": false, - "responseHeaders": null - }, - "rateLimit": { - "connections": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rps": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rpm": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - } - }, - "redirect": { - "target": "", - "addBaseUrl": false, - "sslRedirect": false, - "forceSSLRedirect": false, - "appRoot": "" - }, - "whitelist": { - "cidr": null - }, - "proxy": { - "bodySize": "1m", - "conectTimeout": 5, - "sendTimeout": 60, - "readTimeout": 60, - "bufferSize": "4k", - "cookieDomain": "off", - "cookiePath": "off", - "nextUpstream": "error timeout invalid_header http_502 http_503 http_504" - }, - "certificateAuth": { - "authSSLCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "validationDepth": 0 - }, - "use-port-in-redirects": false, - "configuration-snippet": "" - }] - }, { - "hostname": "dev.mycompany.com", - "sslPassthrough": false, - "sslCertificate": "/ingress-controller/ssl/default-mycompany.pem", - "sslExpireTime": "2027-06-20T20:28:25Z", - "sslPemChecksum": "b9282485e120e4fad8c25d15dc1b7984fcde99ba", - "locations": [{ - "path": "/bar", - "isDefBackend": false, - "backend": "default-http-svc-80", - "service": { - "metadata": { - "name": "http-svc", - "namespace": "default", - "selfLink": "/api/v1/namespaces/default/services/http-svc", - "uid": "88b3c8a8-517e-11e7-b3db-080027494b5d", - "resourceVersion": "4242", - "creationTimestamp": "2017-06-15T03:55:55Z", - "labels": { - "app": "http-svc" - } - }, - "spec": { - "ports": [{ - "name": "http", - "protocol": "TCP", - "port": 80, - "targetPort": 8080, - "nodePort": 30301 - }], - "selector": { - "app": "http-svc" - }, - "clusterIP": "10.0.0.224", - "type": "NodePort", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 80, - "basicDigestAuth": { - "type": "", - "realm": "", - "file": "", - "secured": false, - "fileSha": "" - }, - "externalAuth": { - "url": "", - "host": "", - "signinUrl": "", - "method": "", - "sendBody": false, - "responseHeaders": null - }, - "rateLimit": { - "connections": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rps": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rpm": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - } - }, - "redirect": { - "target": "", - "addBaseUrl": false, - "sslRedirect": true, - "forceSSLRedirect": false, - "appRoot": "" - }, - "whitelist": { - "cidr": null - }, - "proxy": { - "bodySize": "1m", - "conectTimeout": 5, - "sendTimeout": 60, - "readTimeout": 60, - "bufferSize": "4k", - "cookieDomain": "off", - "cookiePath": "off", - "nextUpstream": "error timeout invalid_header http_502 http_503 http_504" - }, - "certificateAuth": { - "authSSLCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "validationDepth": 0 - }, - "use-port-in-redirects": false, - "configuration-snippet": "" - }, { - "path": "/", - "isDefBackend": true, - "backend": "upstream-default-backend", - "service": { - "metadata": { - "creationTimestamp": null - }, - "spec": {}, - "status": { - "loadBalancer": {} - } - }, - "port": 0, - "basicDigestAuth": { - "type": "", - "realm": "", - "file": "", - "secured": false, - "fileSha": "" - }, - "externalAuth": { - "url": "", - "host": "", - "signinUrl": "", - "method": "", - "sendBody": false, - "responseHeaders": null - }, - "rateLimit": { - "connections": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rps": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rpm": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - } - }, - "redirect": { - "target": "", - "addBaseUrl": false, - "sslRedirect": false, - "forceSSLRedirect": false, - "appRoot": "" - }, - "whitelist": { - "cidr": null - }, - "proxy": { - "bodySize": "1m", - "conectTimeout": 5, - "sendTimeout": 60, - "readTimeout": 60, - "bufferSize": "4k", - "cookieDomain": "off", - "cookiePath": "off", - "nextUpstream": "error timeout invalid_header http_502 http_503 http_504" - }, - "certificateAuth": { - "authSSLCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "validationDepth": 0 - }, - "use-port-in-redirects": false, - "configuration-snippet": "" - }] - }, { - "hostname": "domain.tld", - "sslPassthrough": false, - "sslCertificate": "", - "sslExpireTime": "0001-01-01T00:00:00Z", - "sslPemChecksum": "", - "locations": [{ - "path": "/dashboard", - "isDefBackend": false, - "backend": "kube-system-kubernetes-dashboard-80", - "service": { - "metadata": { - "name": "kubernetes-dashboard", - "namespace": "kube-system", - "selfLink": "/api/v1/namespaces/kube-system/services/kubernetes-dashboard", - "uid": "b957713f-5176-11e7-b3db-080027494b5d", - "resourceVersion": "82", - "creationTimestamp": "2017-06-15T03:00:01Z", - "labels": { - "addonmanager.kubernetes.io/mode": "Reconcile", - "app": "kubernetes-dashboard", - "kubernetes.io/minikube-addons": "dashboard", - "kubernetes.io/minikube-addons-endpoint": "dashboard" - }, - "annotations": { - "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"annotations\":{},\"labels\":{\"addonmanager.kubernetes.io/mode\":\"Reconcile\",\"app\":\"kubernetes-dashboard\",\"kubernetes.io/minikube-addons\":\"dashboard\",\"kubernetes.io/minikube-addons-endpoint\":\"dashboard\"},\"name\":\"kubernetes-dashboard\",\"namespace\":\"kube-system\"},\"spec\":{\"ports\":[{\"nodePort\":30000,\"port\":80,\"targetPort\":9090}],\"selector\":{\"app\":\"kubernetes-dashboard\"},\"type\":\"NodePort\"}}\n" - } - }, - "spec": { - "ports": [{ - "protocol": "TCP", - "port": 80, - "targetPort": 9090, - "nodePort": 30000 - }], - "selector": { - "app": "kubernetes-dashboard" - }, - "clusterIP": "10.0.0.120", - "type": "NodePort", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 80, - "basicDigestAuth": { - "type": "", - "realm": "", - "file": "", - "secured": false, - "fileSha": "" - }, - "externalAuth": { - "url": "", - "host": "", - "signinUrl": "", - "method": "", - "sendBody": false, - "responseHeaders": null - }, - "rateLimit": { - "connections": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rps": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rpm": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - } - }, - "redirect": { - "target": "/", - "addBaseUrl": false, - "sslRedirect": true, - "forceSSLRedirect": false, - "appRoot": "" - }, - "whitelist": { - "cidr": null - }, - "proxy": { - "bodySize": "1m", - "conectTimeout": 5, - "sendTimeout": 60, - "readTimeout": 60, - "bufferSize": "4k", - "cookieDomain": "off", - "cookiePath": "off", - "nextUpstream": "error timeout invalid_header http_502 http_503 http_504" - }, - "certificateAuth": { - "authSSLCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "validationDepth": 0 - }, - "use-port-in-redirects": false, - "configuration-snippet": "" - }, { - "path": "/", - "isDefBackend": true, - "backend": "upstream-default-backend", - "service": { - "metadata": { - "creationTimestamp": null - }, - "spec": {}, - "status": { - "loadBalancer": {} - } - }, - "port": 0, - "basicDigestAuth": { - "type": "", - "realm": "", - "file": "", - "secured": false, - "fileSha": "" - }, - "externalAuth": { - "url": "", - "host": "", - "signinUrl": "", - "method": "", - "sendBody": false, - "responseHeaders": null - }, - "rateLimit": { - "connections": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rps": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rpm": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - } - }, - "redirect": { - "target": "", - "addBaseUrl": false, - "sslRedirect": false, - "forceSSLRedirect": false, - "appRoot": "" - }, - "whitelist": { - "cidr": null - }, - "proxy": { - "bodySize": "1m", - "conectTimeout": 5, - "sendTimeout": 60, - "readTimeout": 60, - "bufferSize": "4k", - "cookieDomain": "off", - "cookiePath": "off", - "nextUpstream": "error timeout invalid_header http_502 http_503 http_504" - }, - "certificateAuth": { - "authSSLCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "validationDepth": 0 - }, - "use-port-in-redirects": false, - "configuration-snippet": "" - }] - }], - "TCPBackends": [], - "UDPBackends": [] -} \ No newline at end of file diff --git a/tests/manifests/configuration-b.json b/tests/manifests/configuration-b.json deleted file mode 100644 index f9235a17a1..0000000000 --- a/tests/manifests/configuration-b.json +++ /dev/null @@ -1,689 +0,0 @@ -{ - "backends": [{ - "name": "upstream-default-backend", - "service": { - "metadata": { - "name": "default-http-backend", - "namespace": "kube-system", - "selfLink": "/api/v1/namespaces/kube-system/services/default-http-backend", - "uid": "907dc7db-5178-11e7-b3db-080027494b5d", - "resourceVersion": "3249707", - "creationTimestamp": "2017-06-15T03:13:12Z", - "labels": { - "k8s-app": "default-http-backend" - } - }, - "spec": { - "ports": [{ - "protocol": "TCP", - "port": 80, - "targetPort": 80 - }], - "selector": { - "k8s-app": "default-http-backend" - }, - "clusterIP": "10.0.0.131", - "type": "ClusterIP", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 0, - "secure": false, - "secureCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "sslPassthrough": false, - "endpoints": [{ - "address": "172.17.0.3", - "port": "80", - "maxFails": 0, - "failTimeout": 0, - "target": { - "kind": "Pod", - "namespace": "kube-system", - "name": "default-http-backend-3371703669-4dfnt", - "uid": "72e9c21f-793e-11e7-ac58-080027494b5d", - "resourceVersion": "3700969" - } - }], - "sessionAffinityConfig": { - "name": "", - "cookieSessionAffinity": { - "name": "", - "hash": "" - } - } - }, { - "name": "default-http-svc-80", - "service": { - "metadata": { - "name": "http-svc", - "namespace": "default", - "selfLink": "/api/v1/namespaces/default/services/http-svc", - "uid": "88b3c8a8-517e-11e7-b3db-080027494b5d", - "resourceVersion": "4242", - "creationTimestamp": "2017-06-15T03:55:55Z", - "labels": { - "app": "http-svc" - } - }, - "spec": { - "ports": [{ - "name": "http", - "protocol": "TCP", - "port": 80, - "targetPort": 8080, - "nodePort": 30301 - }], - "selector": { - "app": "http-svc" - }, - "clusterIP": "10.0.0.224", - "type": "NodePort", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 80, - "secure": false, - "secureCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "sslPassthrough": false, - "endpoints": [{ - "address": "172.17.0.2", - "port": "8080", - "maxFails": 0, - "failTimeout": 0, - "target": { - "kind": "Pod", - "namespace": "default", - "name": "http-svc-w088k", - "uid": "283a4361-7c7c-11e7-b124-080027494b5d", - "resourceVersion": "3700943" - } - }, { - "address": "172.17.0.5", - "port": "8080", - "maxFails": 0, - "failTimeout": 0, - "target": { - "kind": "Pod", - "namespace": "default", - "name": "http-svc-tp758", - "uid": "43a82d6e-7303-11e7-ac58-080027494b5d", - "resourceVersion": "3700959" - } - }], - "sessionAffinityConfig": { - "name": "", - "cookieSessionAffinity": { - "name": "", - "hash": "" - } - } - }, { - "name": "kube-system-kubernetes-dashboard-80", - "service": { - "metadata": { - "name": "kubernetes-dashboard", - "namespace": "kube-system", - "selfLink": "/api/v1/namespaces/kube-system/services/kubernetes-dashboard", - "uid": "b957713f-5176-11e7-b3db-080027494b5d", - "resourceVersion": "82", - "creationTimestamp": "2017-06-15T03:00:01Z", - "labels": { - "addonmanager.kubernetes.io/mode": "Reconcile", - "app": "kubernetes-dashboard", - "kubernetes.io/minikube-addons": "dashboard", - "kubernetes.io/minikube-addons-endpoint": "dashboard" - }, - "annotations": { - "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"annotations\":{},\"labels\":{\"addonmanager.kubernetes.io/mode\":\"Reconcile\",\"app\":\"kubernetes-dashboard\",\"kubernetes.io/minikube-addons\":\"dashboard\",\"kubernetes.io/minikube-addons-endpoint\":\"dashboard\"},\"name\":\"kubernetes-dashboard\",\"namespace\":\"kube-system\"},\"spec\":{\"ports\":[{\"nodePort\":30000,\"port\":80,\"targetPort\":9090}],\"selector\":{\"app\":\"kubernetes-dashboard\"},\"type\":\"NodePort\"}}\n" - } - }, - "spec": { - "ports": [{ - "protocol": "TCP", - "port": 80, - "targetPort": 9090, - "nodePort": 30000 - }], - "selector": { - "app": "kubernetes-dashboard" - }, - "clusterIP": "10.0.0.120", - "type": "NodePort", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 80, - "secure": false, - "secureCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "sslPassthrough": false, - "endpoints": [{ - "address": "172.17.0.6", - "port": "9090", - "maxFails": 0, - "failTimeout": 0, - "target": { - "kind": "Pod", - "namespace": "kube-system", - "name": "kubernetes-dashboard-m3qc0", - "uid": "b9511631-5176-11e7-b3db-080027494b5d", - "resourceVersion": "3700964" - } - }], - "sessionAffinityConfig": { - "name": "", - "cookieSessionAffinity": { - "name": "", - "hash": "" - } - } - }], - "servers": [{ - "hostname": "_", - "sslPassthrough": false, - "sslCertificate": "/ingress-controller/ssl/default-fake-certificate.pem", - "sslExpireTime": "0001-01-01T00:00:00Z", - "sslPemChecksum": "84d4ecb651dae44d625531bf77b6265d660b60b2", - "locations": [{ - "path": "/", - "isDefBackend": true, - "backend": "upstream-default-backend", - "service": { - "metadata": { - "name": "default-http-backend", - "namespace": "kube-system", - "selfLink": "/api/v1/namespaces/kube-system/services/default-http-backend", - "uid": "907dc7db-5178-11e7-b3db-080027494b5d", - "resourceVersion": "3249707", - "creationTimestamp": "2017-06-15T03:13:12Z", - "labels": { - "k8s-app": "default-http-backend" - } - }, - "spec": { - "ports": [{ - "protocol": "TCP", - "port": 80, - "targetPort": 80 - }], - "selector": { - "k8s-app": "default-http-backend" - }, - "clusterIP": "10.0.0.131", - "type": "ClusterIP", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 0, - "basicDigestAuth": { - "type": "", - "realm": "", - "file": "", - "secured": false, - "fileSha": "" - }, - "externalAuth": { - "url": "", - "host": "", - "signinUrl": "", - "method": "", - "sendBody": false, - "responseHeaders": null - }, - "rateLimit": { - "connections": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rps": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rpm": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - } - }, - "redirect": { - "target": "", - "addBaseUrl": false, - "sslRedirect": false, - "forceSSLRedirect": false, - "appRoot": "" - }, - "whitelist": { - "cidr": null - }, - "proxy": { - "bodySize": "1m", - "conectTimeout": 5, - "sendTimeout": 60, - "readTimeout": 60, - "bufferSize": "4k", - "cookieDomain": "off", - "cookiePath": "off", - "nextUpstream": "error timeout invalid_header http_502 http_503 http_504" - }, - "certificateAuth": { - "authSSLCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "validationDepth": 0 - }, - "use-port-in-redirects": false, - "configuration-snippet": "" - }] - }, { - "hostname": "dev.mycompany.com", - "sslPassthrough": false, - "sslCertificate": "/ingress-controller/ssl/default-mycompany.pem", - "sslExpireTime": "2027-06-20T20:28:25Z", - "sslPemChecksum": "b9282485e120e4fad8c25d15dc1b7984fcde99ba", - "locations": [{ - "path": "/bar", - "isDefBackend": false, - "backend": "default-http-svc-80", - "service": { - "metadata": { - "name": "http-svc", - "namespace": "default", - "selfLink": "/api/v1/namespaces/default/services/http-svc", - "uid": "88b3c8a8-517e-11e7-b3db-080027494b5d", - "resourceVersion": "4242", - "creationTimestamp": "2017-06-15T03:55:55Z", - "labels": { - "app": "http-svc" - } - }, - "spec": { - "ports": [{ - "name": "http", - "protocol": "TCP", - "port": 80, - "targetPort": 8080, - "nodePort": 30301 - }], - "selector": { - "app": "http-svc" - }, - "clusterIP": "10.0.0.224", - "type": "NodePort", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 80, - "basicDigestAuth": { - "type": "", - "realm": "", - "file": "", - "secured": false, - "fileSha": "" - }, - "externalAuth": { - "url": "", - "host": "", - "signinUrl": "", - "method": "", - "sendBody": false, - "responseHeaders": null - }, - "rateLimit": { - "connections": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rps": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rpm": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - } - }, - "redirect": { - "target": "", - "addBaseUrl": false, - "sslRedirect": true, - "forceSSLRedirect": false, - "appRoot": "" - }, - "whitelist": { - "cidr": null - }, - "proxy": { - "bodySize": "1m", - "conectTimeout": 5, - "sendTimeout": 60, - "readTimeout": 60, - "bufferSize": "4k", - "cookieDomain": "off", - "cookiePath": "off", - "nextUpstream": "error timeout invalid_header http_502 http_503 http_504" - }, - "certificateAuth": { - "authSSLCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "validationDepth": 0 - }, - "use-port-in-redirects": false, - "configuration-snippet": "" - }, { - "path": "/", - "isDefBackend": true, - "backend": "upstream-default-backend", - "service": { - "metadata": { - "creationTimestamp": null - }, - "spec": {}, - "status": { - "loadBalancer": {} - } - }, - "port": 0, - "basicDigestAuth": { - "type": "", - "realm": "", - "file": "", - "secured": false, - "fileSha": "" - }, - "externalAuth": { - "url": "", - "host": "", - "signinUrl": "", - "method": "", - "sendBody": false, - "responseHeaders": null - }, - "rateLimit": { - "connections": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rps": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rpm": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - } - }, - "redirect": { - "target": "", - "addBaseUrl": false, - "sslRedirect": false, - "forceSSLRedirect": false, - "appRoot": "" - }, - "whitelist": { - "cidr": null - }, - "proxy": { - "bodySize": "1m", - "conectTimeout": 5, - "sendTimeout": 60, - "readTimeout": 60, - "bufferSize": "4k", - "cookieDomain": "off", - "cookiePath": "off", - "nextUpstream": "error timeout invalid_header http_502 http_503 http_504" - }, - "certificateAuth": { - "authSSLCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "validationDepth": 0 - }, - "use-port-in-redirects": false, - "configuration-snippet": "" - }] - }, { - "hostname": "domain.tld", - "sslPassthrough": false, - "sslCertificate": "", - "sslExpireTime": "0001-01-01T00:00:00Z", - "sslPemChecksum": "", - "locations": [{ - "path": "/dashboard", - "isDefBackend": false, - "backend": "kube-system-kubernetes-dashboard-80", - "service": { - "metadata": { - "name": "kubernetes-dashboard", - "namespace": "kube-system", - "selfLink": "/api/v1/namespaces/kube-system/services/kubernetes-dashboard", - "uid": "b957713f-5176-11e7-b3db-080027494b5d", - "resourceVersion": "82", - "creationTimestamp": "2017-06-15T03:00:01Z", - "labels": { - "addonmanager.kubernetes.io/mode": "Reconcile", - "app": "kubernetes-dashboard", - "kubernetes.io/minikube-addons": "dashboard", - "kubernetes.io/minikube-addons-endpoint": "dashboard" - }, - "annotations": { - "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"annotations\":{},\"labels\":{\"addonmanager.kubernetes.io/mode\":\"Reconcile\",\"app\":\"kubernetes-dashboard\",\"kubernetes.io/minikube-addons\":\"dashboard\",\"kubernetes.io/minikube-addons-endpoint\":\"dashboard\"},\"name\":\"kubernetes-dashboard\",\"namespace\":\"kube-system\"},\"spec\":{\"ports\":[{\"nodePort\":30000,\"port\":80,\"targetPort\":9090}],\"selector\":{\"app\":\"kubernetes-dashboard\"},\"type\":\"NodePort\"}}\n" - } - }, - "spec": { - "ports": [{ - "protocol": "TCP", - "port": 80, - "targetPort": 9090, - "nodePort": 30000 - }], - "selector": { - "app": "kubernetes-dashboard" - }, - "clusterIP": "10.0.0.120", - "type": "NodePort", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 80, - "basicDigestAuth": { - "type": "", - "realm": "", - "file": "", - "secured": false, - "fileSha": "" - }, - "externalAuth": { - "url": "", - "host": "", - "signinUrl": "", - "method": "", - "sendBody": false, - "responseHeaders": null - }, - "rateLimit": { - "connections": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rps": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rpm": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - } - }, - "redirect": { - "target": "/", - "addBaseUrl": false, - "sslRedirect": true, - "forceSSLRedirect": false, - "appRoot": "" - }, - "whitelist": { - "cidr": null - }, - "proxy": { - "bodySize": "1m", - "conectTimeout": 5, - "sendTimeout": 60, - "readTimeout": 60, - "bufferSize": "4k", - "cookieDomain": "off", - "cookiePath": "off", - "nextUpstream": "error timeout invalid_header http_502 http_503 http_504" - }, - "certificateAuth": { - "authSSLCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "validationDepth": 0 - }, - "use-port-in-redirects": false, - "configuration-snippet": "" - }, { - "path": "/", - "isDefBackend": true, - "backend": "upstream-default-backend", - "service": { - "metadata": { - "creationTimestamp": null - }, - "spec": {}, - "status": { - "loadBalancer": {} - } - }, - "port": 0, - "basicDigestAuth": { - "type": "", - "realm": "", - "file": "", - "secured": false, - "fileSha": "" - }, - "externalAuth": { - "url": "", - "host": "", - "signinUrl": "", - "method": "", - "sendBody": false, - "responseHeaders": null - }, - "proxy": { - "bodySize": "1m", - "conectTimeout": 5, - "sendTimeout": 60, - "readTimeout": 60, - "bufferSize": "4k", - "cookieDomain": "off", - "cookiePath": "off", - "nextUpstream": "error timeout invalid_header http_502 http_503 http_504" - }, - "certificateAuth": { - "authSSLCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "validationDepth": 0 - }, - "use-port-in-redirects": false, - "configuration-snippet": "", - "rateLimit": { - "connections": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rps": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rpm": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - } - }, - "redirect": { - "target": "", - "addBaseUrl": false, - "sslRedirect": false, - "forceSSLRedirect": false, - "appRoot": "" - }, - "whitelist": { - "cidr": null - } - }] - }], - "TCPBackends": [], - "UDPBackends": [] -} \ No newline at end of file diff --git a/tests/manifests/configuration-c.json b/tests/manifests/configuration-c.json deleted file mode 100644 index ee2078015c..0000000000 --- a/tests/manifests/configuration-c.json +++ /dev/null @@ -1,261 +0,0 @@ -{ - "backends": [{ - "name": "upstream-default-backend", - "service": null, - "port": 0, - "secure": false, - "secureCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "sslPassthrough": false, - "endpoints": [{ - "address": "172.17.0.8", - "port": "8080", - "maxFails": 0, - "failTimeout": 0, - "target": { - "kind": "Pod", - "namespace": "kube-system", - "name": "kubernetes-dashboard-m3qc0", - "uid": "b9511631-5176-11e7-b3db-080027494b5d", - "resourceVersion": "3700964" - } - }], - "SessionAffinity": { - "name": "", - "CookieSessionAffinity": { - "name": "", - "hash": "" - } - } - }, { - "name": "deis-deis-controller-8000", - "service": { - "metadata": { - "name": "deis-controller", - "namespace": "deis", - "selfLink": "/api/v1/namespaces/deis/services/deis-controller", - "uid": "1cba01a8-50b0-11e7-a384-0800270f5693", - "resourceVersion": "532", - "creationTimestamp": "2017-06-14T03:18:18Z", - "labels": { - "heritage": "deis" - } - }, - "spec": { - "ports": [{ - "name": "http", - "protocol": "TCP", - "port": 8000, - "targetPort": 8000, - "nodePort": 30171 - }], - "selector": { - "app": "deis-controller" - }, - "clusterIP": "10.0.0.198", - "type": "NodePort", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 8000, - "secure": false, - "secureCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "sslPassthrough": false, - "endpoints": [{ - "address": "172.17.0.7", - "port": "8000", - "maxFails": 0, - "failTimeout": 0 - }], - "SessionAffinity": { - "name": "", - "CookieSessionAffinity": { - "name": "", - "hash": "" - } - } - }], - "servers": [{ - "hostname": "_", - "sslPassthrough": false, - "sslCertificate": "/ingress-controller/ssl/default-fake-certificate.pem", - "sslExpireTime": "0001-01-01T00:00:00Z", - "sslPemChecksum": "123b44425920a2e4825ae779fba0e6e07fbac03d", - "locations": [{ - "path": "/", - "isDefBackend": true, - "backend": "upstream-default-backend", - "service": null, - "port": 0, - "basicDigestAuth": { - "type": "", - "realm": "", - "file": "", - "secured": false - }, - "Denied": null, - "externalAuth": { - "url": "", - "host": "", - "signinUrl": "", - "method": "", - "sendBody": false, - "responseHeaders": null - }, - "rateLimit": { - "connections": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rps": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - } - }, - "redirect": { - "target": "", - "addBaseUrl": false, - "sslRedirect": false, - "forceSSLRedirect": false, - "appRoot": "" - }, - "whitelist": { - "cidr": null - }, - "proxy": { - "bodySize": "1g", - "conectTimeout": 5, - "sendTimeout": 60, - "readTimeout": 60, - "bufferSize": "4k", - "cookieDomain": "off", - "cookiePath": "off" - }, - "certificateAuth": { - "AuthSSLCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "validationDepth": 0 - }, - "use-port-in-redirects": false, - "configuration-snippet": "" - }] - }, { - "hostname": "deis.minikube", - "sslPassthrough": false, - "sslCertificate": "", - "sslExpireTime": "0001-01-01T00:00:00Z", - "sslPemChecksum": "", - "locations": [{ - "path": "/", - "isDefBackend": false, - "backend": "deis-deis-controller-8000", - "service": { - "metadata": { - "name": "deis-controller", - "namespace": "deis", - "selfLink": "/api/v1/namespaces/deis/services/deis-controller", - "uid": "1cba01a8-50b0-11e7-a384-0800270f5693", - "resourceVersion": "532", - "creationTimestamp": "2017-06-14T03:18:18Z", - "labels": { - "heritage": "deis" - } - }, - "spec": { - "ports": [{ - "name": "http", - "protocol": "TCP", - "port": 8000, - "targetPort": 8000, - "nodePort": 30171 - }], - "selector": { - "app": "deis-controller" - }, - "clusterIP": "10.0.0.198", - "type": "NodePort", - "sessionAffinity": "None" - }, - "status": { - "loadBalancer": {} - } - }, - "port": 8000, - "basicDigestAuth": { - "type": "", - "realm": "", - "file": "", - "secured": false - }, - "Denied": null, - "externalAuth": { - "url": "", - "host": "", - "signinUrl": "", - "method": "", - "sendBody": false, - "responseHeaders": null - }, - "rateLimit": { - "connections": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - }, - "rps": { - "name": "", - "limit": 0, - "burst": 0, - "sharedSize": 0 - } - }, - "redirect": { - "target": "", - "addBaseUrl": false, - "sslRedirect": true, - "forceSSLRedirect": false, - "appRoot": "" - }, - "whitelist": { - "cidr": null - }, - "proxy": { - "bodySize": "1g", - "conectTimeout": 5, - "sendTimeout": 60, - "readTimeout": 60, - "bufferSize": "4k", - "cookieDomain": "off", - "cookiePath": "off" - }, - "certificateAuth": { - "AuthSSLCert": { - "secret": "", - "caFilename": "", - "pemSha": "" - }, - "validationDepth": 0 - }, - "use-port-in-redirects": false, - "configuration-snippet": "" - }] - }] -}