Merge remote-tracking branch 'origin/master' into chore/update_ecs_ex…

…ample
kumahq · Jan 19, 2021 · 7579123 · 7579123
2 parents 540e6ae + c32bdb4
commit 7579123
Show file tree

Hide file tree

Showing 95 changed files with 8,867 additions and 1,029 deletions.
diff --git a/api/go.sum b/api/go.sum
@@ -18,7 +18,6 @@ github.com/envoyproxy/protoc-gen-validate v0.4.1/go.mod h1:E+IEazqdaWv3FrnGtZIu3
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -146,7 +145,6 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

diff --git a/api/mesh/v1alpha1/dataplane_helpers.go b/api/mesh/v1alpha1/dataplane_helpers.go
@@ -351,6 +351,9 @@ func (d *Dataplane) GetIdentifyingService() string {
 }
 
 func (d *Dataplane) IsIngress() bool {
+	if d.GetNetworking() == nil {
+		return false
+	}
 	return d.Networking.Ingress != nil
 }
 

diff --git a/app/kumactl/cmd/install/install_control_plane_test.go b/app/kumactl/cmd/install/install_control_plane_test.go
@@ -111,6 +111,13 @@ var _ = Describe("kumactl install control-plane", func() {
 			},
 			goldenFile: "install-control-plane.defaults.golden.yaml",
 		}),
+		Entry("should override default env-vars with values supplied", testCase{
+			extraArgs: []string{
+				"--env-var", "KUMA_DEFAULTS_SKIP_MESH_CREATION=true",
+				"--without-kubernetes-connection",
+			},
+			goldenFile: "install-control-plane.override-env-vars.golden.yaml",
+		}),
 		Entry("should generate Kubernetes resources with custom settings", testCase{
 			extraArgs: []string{
 				"--namespace", "kuma",

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
@@ -7121,62 +7121,69 @@ spec:
         kubernetes.io/arch: amd64
         kubernetes.io/os: linux
       containers:
-      - name: control-plane
-        image: "kong-docker-kuma-docker.bintray.io/kuma-cp:0.0.1"
-        imagePullPolicy: IfNotPresent
-        env:
-        - name: KUMA_ENVIRONMENT
-          value: "kubernetes"
-        - name: KUMA_STORE_TYPE
-          value: "kubernetes"
-        - name: KUMA_STORE_KUBERNETES_SYSTEM_NAMESPACE
-          value: "kuma-system"
-        - name: KUMA_GENERAL_TLS_CERT_FILE
-          value: /var/run/secrets/kuma.io/tls-cert/tls.crt
-        - name: KUMA_GENERAL_TLS_KEY_FILE
-          value: /var/run/secrets/kuma.io/tls-cert/tls.key
-        - name: KUMA_API_SERVER_READ_ONLY
-          value: "true"
-        - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_PORT
-          value: "5443"
-        - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_CERT_DIR
-          value: /var/run/secrets/kuma.io/tls-cert
-        - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CNI_ENABLED
-          value: "true"
-        - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_SIDECAR_CONTAINER_IMAGE
-          value: "kong-docker-kuma-docker.bintray.io/kuma-dp:0.0.1"
-        - name: KUMA_INJECTOR_INIT_CONTAINER_IMAGE
-          value: "kong-docker-kuma-docker.bintray.io/kuma-init:0.0.1"
-        - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CA_CERT_FILE
-          value: /var/run/secrets/kuma.io/tls-cert/ca.crt
-        - name: KUMA_DEFAULTS_SKIP_MESH_CREATION
-          value: "false"
-        - name: KUMA_MODE
-          value: "standalone"
-        args:
-        - run
-        - --log-level=info
-        - --config-file=/etc/kuma.io/kuma-control-plane/config.yaml
-        ports:
-        - containerPort: 5681
-        - containerPort: 5682
-        - containerPort: 5443
-        - containerPort: 5678
-        - containerPort: 5653
-          protocol: UDP
-        livenessProbe:
-          httpGet:
-            path: /healthy
-            port: 5680
-        readinessProbe:
-          httpGet:
-            path: /ready
-            port: 5680
-        resources:
-          requests:
-            cpu: 100m
-            memory: 256Mi
-        volumeMounts:
+        - name: control-plane
+          image: "kong-docker-kuma-docker.bintray.io/kuma-cp:0.0.1"
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: KUMA_API_SERVER_READ_ONLY
+              value: "true"
+            - name: KUMA_DEFAULTS_SKIP_MESH_CREATION
+              value: "false"
+            - name: KUMA_ENVIRONMENT
+              value: kubernetes
+            - name: KUMA_GENERAL_TLS_CERT_FILE
+              value: /var/run/secrets/kuma.io/tls-cert/tls.crt
+            - name: KUMA_GENERAL_TLS_KEY_FILE
+              value: /var/run/secrets/kuma.io/tls-cert/tls.key
+            - name: KUMA_INJECTOR_INIT_CONTAINER_IMAGE
+              value: kong-docker-kuma-docker.bintray.io/kuma-init:0.0.1
+            - name: KUMA_MODE
+              value: standalone
+            - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_CERT_DIR
+              value: /var/run/secrets/kuma.io/tls-cert
+            - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_PORT
+              value: "5443"
+            - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CA_CERT_FILE
+              value: /var/run/secrets/kuma.io/tls-cert/ca.crt
+            - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CNI_ENABLED
+              value: "true"
+            - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_SIDECAR_CONTAINER_IMAGE
+              value: kong-docker-kuma-docker.bintray.io/kuma-dp:0.0.1
+            - name: KUMA_STORE_KUBERNETES_SYSTEM_NAMESPACE
+              value: kuma-system
+            - name: KUMA_STORE_TYPE
+              value: kubernetes
+          args:
+            - run
+            - --log-level=info
+            - --config-file=/etc/kuma.io/kuma-control-plane/config.yaml
+          ports:
+            - containerPort: 5681
+            - containerPort: 5682
+            - containerPort: 5443
+            - containerPort: 5678
+            - containerPort: 5653
+              protocol: UDP
+          livenessProbe:
+            httpGet:
+              path: /healthy
+              port: 5680
+          readinessProbe:
+            httpGet:
+              path: /ready
+              port: 5680
+          resources:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+          volumeMounts:
+            - name: general-tls-cert
+              mountPath: /var/run/secrets/kuma.io/tls-cert
+              readOnly: true
+            - name: kuma-control-plane-config
+              mountPath: /etc/kuma.io/kuma-control-plane
+              readOnly: true
+      volumes:
         - name: general-tls-cert
           mountPath: /var/run/secrets/kuma.io/tls-cert
           readOnly: true

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
@@ -6958,34 +6958,34 @@ spec:
           image: "kong-docker-kuma-docker.bintray.io/kuma-cp:0.0.1"
           imagePullPolicy: IfNotPresent
           env:
+            - name: KUMA_API_SERVER_READ_ONLY
+              value: "true"
+            - name: KUMA_DEFAULTS_SKIP_MESH_CREATION
+              value: "false"
             - name: KUMA_ENVIRONMENT
-              value: "kubernetes"
-            - name: KUMA_STORE_TYPE
-              value: "kubernetes"
-            - name: KUMA_STORE_KUBERNETES_SYSTEM_NAMESPACE
-              value: "kuma-system"
+              value: kubernetes
             - name: KUMA_GENERAL_TLS_CERT_FILE
               value: /var/run/secrets/kuma.io/tls-cert/tls.crt
             - name: KUMA_GENERAL_TLS_KEY_FILE
               value: /var/run/secrets/kuma.io/tls-cert/tls.key
-            - name: KUMA_API_SERVER_READ_ONLY
-              value: "true"
-            - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_PORT
-              value: "5443"
+            - name: KUMA_INJECTOR_INIT_CONTAINER_IMAGE
+              value: kong-docker-kuma-docker.bintray.io/kuma-init:0.0.1
+            - name: KUMA_MODE
+              value: standalone
             - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_CERT_DIR
               value: /var/run/secrets/kuma.io/tls-cert
-            - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CNI_ENABLED
-              value: "false"
-            - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_SIDECAR_CONTAINER_IMAGE
-              value: "kong-docker-kuma-docker.bintray.io/kuma-dp:0.0.1"
-            - name: KUMA_INJECTOR_INIT_CONTAINER_IMAGE
-              value: "kong-docker-kuma-docker.bintray.io/kuma-init:0.0.1"
+            - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_PORT
+              value: "5443"
             - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CA_CERT_FILE
               value: /var/run/secrets/kuma.io/tls-cert/ca.crt
-            - name: KUMA_DEFAULTS_SKIP_MESH_CREATION
+            - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CNI_ENABLED
               value: "false"
-            - name: KUMA_MODE
-              value: "standalone"
+            - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_SIDECAR_CONTAINER_IMAGE
+              value: kong-docker-kuma-docker.bintray.io/kuma-dp:0.0.1
+            - name: KUMA_STORE_KUBERNETES_SYSTEM_NAMESPACE
+              value: kuma-system
+            - name: KUMA_STORE_TYPE
+              value: kubernetes
           args:
             - run
             - --log-level=info

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.global.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.global.golden.yaml
@@ -6963,59 +6963,66 @@ spec:
         kubernetes.io/arch: amd64
         kubernetes.io/os: linux
       containers:
-      - name: control-plane
-        image: "kong-docker-kuma-docker.bintray.io/kuma-cp:0.0.1"
-        imagePullPolicy: IfNotPresent
-        env:
-        - name: KUMA_ENVIRONMENT
-          value: "kubernetes"
-        - name: KUMA_STORE_TYPE
-          value: "kubernetes"
-        - name: KUMA_STORE_KUBERNETES_SYSTEM_NAMESPACE
-          value: "kuma-system"
-        - name: KUMA_GENERAL_TLS_CERT_FILE
-          value: /var/run/secrets/kuma.io/tls-cert/tls.crt
-        - name: KUMA_GENERAL_TLS_KEY_FILE
-          value: /var/run/secrets/kuma.io/tls-cert/tls.key
-        - name: KUMA_API_SERVER_READ_ONLY
-          value: "true"
-        - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_PORT
-          value: "5443"
-        - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_CERT_DIR
-          value: /var/run/secrets/kuma.io/tls-cert
-        - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CNI_ENABLED
-          value: "false"
-        - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_SIDECAR_CONTAINER_IMAGE
-          value: "kong-docker-kuma-docker.bintray.io/kuma-dp:0.0.1"
-        - name: KUMA_INJECTOR_INIT_CONTAINER_IMAGE
-          value: "kong-docker-kuma-docker.bintray.io/kuma-init:0.0.1"
-        - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CA_CERT_FILE
-          value: /var/run/secrets/kuma.io/tls-cert/ca.crt
-        - name: KUMA_DEFAULTS_SKIP_MESH_CREATION
-          value: "false"
-        - name: KUMA_MODE
-          value: "global"
-        args:
-        - run
-        - --log-level=info
-        - --config-file=/etc/kuma.io/kuma-control-plane/config.yaml
-        ports:
-        - containerPort: 5681
-        - containerPort: 5682
-        - containerPort: 5443
-        livenessProbe:
-          httpGet:
-            path: /healthy
-            port: 5680
-        readinessProbe:
-          httpGet:
-            path: /ready
-            port: 5680
-        resources:
-          requests:
-            cpu: 500m
-            memory: 256Mi
-        volumeMounts:
+        - name: control-plane
+          image: "kong-docker-kuma-docker.bintray.io/kuma-cp:0.0.1"
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: KUMA_API_SERVER_READ_ONLY
+              value: "true"
+            - name: KUMA_DEFAULTS_SKIP_MESH_CREATION
+              value: "false"
+            - name: KUMA_ENVIRONMENT
+              value: kubernetes
+            - name: KUMA_GENERAL_TLS_CERT_FILE
+              value: /var/run/secrets/kuma.io/tls-cert/tls.crt
+            - name: KUMA_GENERAL_TLS_KEY_FILE
+              value: /var/run/secrets/kuma.io/tls-cert/tls.key
+            - name: KUMA_INJECTOR_INIT_CONTAINER_IMAGE
+              value: kong-docker-kuma-docker.bintray.io/kuma-init:0.0.1
+            - name: KUMA_MODE
+              value: global
+            - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_CERT_DIR
+              value: /var/run/secrets/kuma.io/tls-cert
+            - name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_PORT
+              value: "5443"
+            - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CA_CERT_FILE
+              value: /var/run/secrets/kuma.io/tls-cert/ca.crt
+            - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CNI_ENABLED
+              value: "false"
+            - name: KUMA_RUNTIME_KUBERNETES_INJECTOR_SIDECAR_CONTAINER_IMAGE
+              value: kong-docker-kuma-docker.bintray.io/kuma-dp:0.0.1
+            - name: KUMA_STORE_KUBERNETES_SYSTEM_NAMESPACE
+              value: kuma-system
+            - name: KUMA_STORE_TYPE
+              value: kubernetes
+          args:
+            - run
+            - --log-level=info
+            - --config-file=/etc/kuma.io/kuma-control-plane/config.yaml
+          ports:
+            - containerPort: 5681
+            - containerPort: 5682
+            - containerPort: 5443
+          livenessProbe:
+            httpGet:
+              path: /healthy
+              port: 5680
+          readinessProbe:
+            httpGet:
+              path: /ready
+              port: 5680
+          resources:
+            requests:
+              cpu: 500m
+              memory: 256Mi
+          volumeMounts:
+            - name: general-tls-cert
+              mountPath: /var/run/secrets/kuma.io/tls-cert
+              readOnly: true
+            - name: kuma-control-plane-config
+              mountPath: /etc/kuma.io/kuma-control-plane
+              readOnly: true
+      volumes:
         - name: general-tls-cert
           mountPath: /var/run/secrets/kuma.io/tls-cert
           readOnly: true