Merge pull request #461 from banzaicloud/istio-1.6.4

Support Istio 1.6.4

README.md

@@ -73,7 +73,7 @@ For a complete list of [Backyards](https://banzaicloud.com/products/backyards/)
 
 ## Istio operator installation
 
-The operator (`release-1.6` branch) installs the 1.6.3 version of Istio, and can run on Minikube v1.1.1+ and Kubernetes 1.15.0+.
+The operator (`release-1.6` branch) installs the 1.6.4 version of Istio, and can run on Minikube v1.1.1+ and Kubernetes 1.15.0+.
 
 As a pre-requisite it needs a Kubernetes cluster (you can create one using [Pipeline](https://github.com/banzaicloud/pipeline)).
 

config/samples/istio_v1beta1_istio.yaml

@@ -5,7 +5,7 @@ metadata:
     controller-tools.k8s.io: "1.0"
   name: istio-sample
 spec:
-  version: "1.6.3"
+  version: "1.6.4"
   meshPolicy:
     mtlsMode: PERMISSIVE
   autoMtls: true
@@ -25,7 +25,7 @@ spec:
     enabled: true
   pilot:
     enabled: true
-    image: "docker.io/istio/pilot:1.6.3"
+    image: "docker.io/istio/pilot:1.6.4"
     replicaCount: 1
     minReplicas: 1
     maxReplicas: 5
@@ -102,18 +102,18 @@ spec:
       enabled: false
   policy:
     enabled: false
-    image: "docker.io/istio/mixer:1.6.3"
+    image: "docker.io/istio/mixer:1.6.4"
     replicaCount: 1
     minReplicas: 1
     maxReplicas: 5
   telemetry:
     enabled: false
-    image: "docker.io/istio/mixer:1.6.3"
+    image: "docker.io/istio/mixer:1.6.4"
     replicaCount: 1
     minReplicas: 1
     maxReplicas: 5
   proxy:
-    image: "docker.io/istio/proxyv2:1.6.3"
+    image: "docker.io/istio/proxyv2:1.6.4"
     accessLogFile: "/dev/stdout"
     accessLogFormat: ""
     accessLogEncoding: "TEXT"
@@ -126,7 +126,7 @@ spec:
         cpu: 2000m
         memory: 1024Mi
   proxyInit:
-    image: "docker.io/istio/proxyv2:1.6.3"
+    image: "docker.io/istio/proxyv2:1.6.4"
   defaultPodDisruptionBudget:
     enabled: true
   outboundTrafficPolicy:

config/samples/istio_v1beta1_istio_cni.yaml

@@ -5,7 +5,7 @@ metadata:
     controller-tools.k8s.io: "1.0"
   name: istio-sample
 spec:
-  version: "1.6.3"
+  version: "1.6.4"
   meshPolicy:
     mtlsMode: PERMISSIVE
   autoInjectionNamespaces:
@@ -27,5 +27,5 @@ spec:
         brokenPodLabelKey: "cni.istio.io/uninitialized"
         brokenPodLabelValue: "true"
   proxy:
-    image: "docker.io/istio/proxyv2:1.6.3"
+    image: "docker.io/istio/proxyv2:1.6.4"
   jwtPolicy: "first-party-jwt"

config/samples/istio_v1beta1_istio_cni_gke.yaml

@@ -5,7 +5,7 @@ metadata:
     controller-tools.k8s.io: "1.0"
   name: istio-sample
 spec:
-  version: "1.6.3"
+  version: "1.6.4"
   meshPolicy:
     mtlsMode: PERMISSIVE
   autoInjectionNamespaces:
@@ -28,5 +28,5 @@ spec:
         brokenPodLabelKey: "cni.istio.io/uninitialized"
         brokenPodLabelValue: "true"
   proxy:
-    image: "docker.io/istio/proxyv2:1.6.3"
+    image: "docker.io/istio/proxyv2:1.6.4"
   jwtPolicy: "first-party-jwt"

config/samples/istio_v1beta1_istio_meshexpansion.yaml

@@ -5,7 +5,7 @@ metadata:
     controller-tools.k8s.io: "1.0"
   name: istio-sample
 spec:
-  version: "1.6.3"
+  version: "1.6.4"
   autoInjectionNamespaces:
   - "default"
   useMCP: false
@@ -14,5 +14,5 @@ spec:
   meshExpansion: true
   controlPlaneSecurityEnabled: true
   proxy:
-    image: "docker.io/istio/proxyv2:1.6.3"
+    image: "docker.io/istio/proxyv2:1.6.4"
   jwtPolicy: "first-party-jwt"

config/samples/istio_v1beta1_istio_minimal.yaml

@@ -7,7 +7,7 @@ metadata:
     controller-tools.k8s.io: "1.0"
   name: istio-sample
 spec:
-  version: "1.6.3"
+  version: "1.6.4"
   meshPolicy:
     mtlsMode: PERMISSIVE
   autoInjectionNamespaces:
@@ -31,5 +31,5 @@ spec:
   tracing:
     enabled: false
   proxy:
-    image: "docker.io/istio/proxyv2:1.6.3"
+    image: "docker.io/istio/proxyv2:1.6.4"
   jwtPolicy: "first-party-jwt"

config/samples/istio_v1beta1_istio_multimesh.yaml

@@ -5,7 +5,7 @@ metadata:
     controller-tools.k8s.io: "1.0"
   name: multimesh
 spec:
-  version: "1.6.3"
+  version: "1.6.4"
   autoInjectionNamespaces:
   - "default"
   useMCP: false
@@ -18,5 +18,5 @@ spec:
   citadel:
     caSecretName: "cacerts"
   proxy:
-    image: "docker.io/istio/proxyv2:1.6.3"
+    image: "docker.io/istio/proxyv2:1.6.4"
   jwtPolicy: "first-party-jwt"

deploy/charts/istio-operator/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 name: istio-operator
-version: 0.0.53
+version: 0.0.54
 description: istio-operator manages Istio deployments on Kubernetes
 sources:
   - https://github.com/banzaicloud/istio-operator
-appVersion: 0.6.4
+appVersion: 0.6.5
 icon: https://istio.io/img/istio-logo-social-blue-background.svg

deploy/charts/istio-operator/README.md

@@ -32,7 +32,7 @@ The following table lists the configurable parameters of the Banzaicloud Istio O
 Parameter | Description | Default
 --------- | ----------- | -------
 `operator.image.repository` | Operator container image repository | `banzaicloud/istio-operator`
-`operator.image.tag` | Operator container image tag | `0.6.4`
+`operator.image.tag` | Operator container image tag | `0.6.5`
 `operator.image.pullPolicy` | Operator container image pull policy | `IfNotPresent`
 `operator.resources` | CPU/Memory resource requests/limits (YAML) | Memory: `256Mi`, CPU: `200m`
 `istioVersion` | Supported Istio version | `1.6`

deploy/charts/istio-operator/values.yaml

@@ -5,7 +5,7 @@
 operator:
   image:
     repository: banzaicloud/istio-operator
-    tag: 0.6.4
+    tag: 0.6.5
     pullPolicy: IfNotPresent
   resources:
     requests:

docs/federation/gateway/samples/istio-multicluster-cr.yaml

@@ -3,7 +3,7 @@ kind: Istio
 metadata:
   name: gateway-multicluster
 spec:
-  version: "1.6.3"
+  version: "1.6.4"
   autoInjectionNamespaces:
   - "default"
   meshPolicy:

docs/federation/multimesh/istio-multimesh-cr.yaml

@@ -5,7 +5,7 @@ metadata:
     controller-tools.k8s.io: "1.0"
   name: multimesh
 spec:
-  version: "1.6.3"
+  version: "1.6.4"
   autoInjectionNamespaces:
   - "default"
   useMCP: false

docs/upgrade.md

@@ -4,10 +4,10 @@ The steps are listed in this doc to perform an Istio version upgrade with the op
 
 ## Istio Control Plane Upgrade
 
-Let us suppose that we have a [Kubernetes](https://kubernetes.io/) cluster with Istio 1.5.4, and we would like to upgrade our Istio components to Istio version 1.6.3. Here are the steps we need to perform to accomplish this with the operator:
+Let us suppose that we have a [Kubernetes](https://kubernetes.io/) cluster with Istio 1.5.4, and we would like to upgrade our Istio components to Istio version 1.6.4. Here are the steps we need to perform to accomplish this with the operator:
 
 1. Deploy a version of the operator which supports Istio 1.6.x
-2. Apply a [Custom Resource](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) using Istio 1.6.3 components
+2. Apply a [Custom Resource](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) using Istio 1.6.4 components
 
 What happens is that once the operator discerns that the Custom Resource it's watching has changed, it reconciles all Istio-related components in order to perform a control plane upgrade.
 
@@ -114,9 +114,9 @@ $ INGRESS_HOST=$(kubectl -n istio-system get service istio-ingressgateway -o jso
 $ open http://$INGRESS_HOST/productpage
 ```
 
-#### Install Istio 1.6.3
+#### Install Istio 1.6.4
 
-To install Istio 1.6.3, first we need to check out the `release-1.6` branch of our operator (this branch supports the Istio 1.6.x versions):
+To install Istio 1.6.4, first we need to check out the `release-1.6` branch of our operator (this branch supports the Istio 1.6.x versions):
 
 ```bash
 $ git clone [email protected]:banzaicloud/istio-operator.git
@@ -141,16 +141,16 @@ Alternatively, you can deploy the operator using a [Helm chart](https://github.c
 
 ```bash
 $ helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com
-$ helm upgrade istio-operator --install --namespace=istio-system --set-string operator.image.tag=0.6.4 banzaicloud-stable/istio-operator
+$ helm upgrade istio-operator --install --namespace=istio-system --set-string operator.image.tag=0.6.5 banzaicloud-stable/istio-operator
 ```
 
-*Note: As of now, the `0.6.4` tag is the latest version of our operator to support Istio versions 1.6.x*
+*Note: As of now, the `0.6.5` tag is the latest version of our operator to support Istio versions 1.6.x*
 
 **Use the new Custom Resource**
 
 > If you've installed Istio 1.5.4 or earlier with the Istio operator, and if you check the logs of the operator pod at this point, you will see the following error message: `intended Istio version is unsupported by this version of the operator`. We need to update the Istio Custom Resource with Istio 1.6's components for the operator to be reconciled with the Istio control plane.
 
-To deploy Istio 1.6.3 with its default configuration options, use the following command:
+To deploy Istio 1.6.4 with its default configuration options, use the following command:
 
 ```bash
 $ kubectl replace -n istio-system -f config/samples/istio_v1beta1_istio.yaml
@@ -166,26 +166,26 @@ istio-operator-controller-manager-0       2/2       Running   0          16m
 istiod-84588fff4c-4lhq8                   2/2       Running   0          7m
 ```
 
-The `Istio` Custom Resource is showing `Available` in its status field, and the Istio components are now using `1.6.3` images:
+The `Istio` Custom Resource is showing `Available` in its status field, and the Istio components are now using `1.6.4` images:
 
 ```bash
 $ kubectl describe istio -n istio-system istio | grep Image:
-    Image:                         docker.io/istio/citadel:1.6.3
-    Image:          docker.io/istio/galley:1.6.3
-    Image:    docker.io/istio/node-agent-k8s:1.6.3
-        Image:    docker.io/istio/node-agent-k8s:1.6.3
-    Image:          coredns/coredns:1.6.3
+    Image:                         docker.io/istio/citadel:1.6.4
+    Image:          docker.io/istio/galley:1.6.4
+    Image:    docker.io/istio/node-agent-k8s:1.6.4
+        Image:    docker.io/istio/node-agent-k8s:1.6.4
+    Image:          coredns/coredns:1.6.4
     Plugin Image:   docker.io/istio/coredns-plugin:0.2-istio-1.1
-    Image:          docker.io/istio/mixer:1.6.3
-    Image:    docker.io/istio/node-agent-k8s:1.6.3
-    Image:          docker.io/istio/pilot:1.6.3
-    Image:             docker.io/istio/proxyv2:1.6.3
-    Image:  docker.io/istio/proxyv2:1.6.3
-    Image:                          docker.io/istio/sidecar_injector:1.6.3
-      Image:                 docker.io/istio/install-cni:1.6.3
+    Image:          docker.io/istio/mixer:1.6.4
+    Image:    docker.io/istio/node-agent-k8s:1.6.4
+    Image:          docker.io/istio/pilot:1.6.4
+    Image:             docker.io/istio/proxyv2:1.6.4
+    Image:  docker.io/istio/proxyv2:1.6.4
+    Image:                          docker.io/istio/sidecar_injector:1.6.4
+      Image:                 docker.io/istio/install-cni:1.6.4
 ```
 
-At this point, your Istio control plane is upgraded to Istio 1.6.3 and your BookInfo application should still be available at:
+At this point, your Istio control plane is upgraded to Istio 1.6.4 and your BookInfo application should still be available at:
 ```bash
 $ open http://$INGRESS_HOST/productpage
 ```

pkg/apis/istio/v1beta1/defaults.go

@@ -28,9 +28,9 @@ import (
 
 const (
 	banzaiImageHub                    = "docker.io/banzaicloud"
-	banzaiImageVersion                = "1.6.3-bzc"
+	banzaiImageVersion                = "1.6.4-bzc"
 	defaultImageHub                   = "docker.io/istio"
-	defaultImageVersion               = "1.6.3"
+	defaultImageVersion               = "1.6.4"
 	defaultLogLevel                   = "default:info"
 	defaultMeshPolicy                 = PERMISSIVE
 	defaultPilotImage                 = defaultImageHub + "/" + "pilot" + ":" + defaultImageVersion
@@ -44,7 +44,7 @@ const (
 	defaultProxyInitImage             = defaultImageHub + "/" + "proxyv2" + ":" + defaultImageVersion
 	defaultProxyCoreDumpImage         = "busybox"
 	defaultInitCNIImage               = defaultImageHub + "/" + "install-cni:" + defaultImageVersion
-	defaultCoreDNSImage               = "coredns/coredns:1.6.3"
+	defaultCoreDNSImage               = "coredns/coredns:1.6.4"
 	defaultCoreDNSPluginImage         = defaultImageHub + "/coredns-plugin:0.2-istio-1.1"
 	defaultIncludeIPRanges            = "*"
 	defaultReplicaCount               = 1

pkg/apis/istio/v1beta1/istio_types_test.go

@@ -36,7 +36,7 @@ func TestStorageIstio(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: IstioSpec{
-			Version: "1.6.3",
+			Version: "1.6.4",
 		},
 	}
 	g := gomega.NewGomegaWithT(t)

pkg/resources/cni/daemonset.go

@@ -219,7 +219,7 @@ func (r *Reconciler) repairImage() string {
 func (r *Reconciler) repairTag() string {
 	repairConfig := r.Config.Spec.SidecarInjector.InitCNIConfiguration.Repair
 	if util.PointerToString(repairConfig.Tag) == "" {
-		return "1.6.3"
+		return "1.6.4"
 	}
 
 	return util.PointerToString(repairConfig.Tag)