From a3a1f0bb8f0cf2d04f279eb4e5f0f6209f74048c Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 10 Sep 2020 16:44:49 +0100 Subject: [PATCH] Istio version bump to 1.6.9 --- charts/kubezero-istio/Chart.yaml | 4 +- .../istio-operator/templates/clusterrole.yaml | 1 + .../istio-operator/templates/deployment.yaml | 6 +- .../charts/istio-operator/values.yaml | 3 +- charts/kubezero-istio/delete_istio_14.sh | 7 --- .../kubezero-istio/templates/istio-base.yaml | 62 +++++++++++++++++++ charts/kubezero-istio/update.sh | 2 +- charts/kubezero-istio/values.yaml | 2 +- 8 files changed, 72 insertions(+), 15 deletions(-) delete mode 100755 charts/kubezero-istio/delete_istio_14.sh diff --git a/charts/kubezero-istio/Chart.yaml b/charts/kubezero-istio/Chart.yaml index e738d6e2..f1e0e668 100644 --- a/charts/kubezero-istio/Chart.yaml +++ b/charts/kubezero-istio/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: kubezero-istio description: KubeZero Umbrella Chart for Istio type: application -version: 0.2.4 -appVersion: 1.6.7 +version: 0.2.5 +appVersion: 1.6.9 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero-istio/charts/istio-operator/templates/clusterrole.yaml b/charts/kubezero-istio/charts/istio-operator/templates/clusterrole.yaml index 53be806e..d02da88d 100644 --- a/charts/kubezero-istio/charts/istio-operator/templates/clusterrole.yaml +++ b/charts/kubezero-istio/charts/istio-operator/templates/clusterrole.yaml @@ -81,6 +81,7 @@ rules: verbs: - get - create + - update - apiGroups: - policy resources: diff --git a/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml b/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml index 8350dd55..5e302de7 100644 --- a/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml +++ b/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml @@ -36,13 +36,13 @@ spec: memory: 128Mi env: - name: WATCH_NAMESPACE - value: {{.Values.istioNamespace}} + value: {{.Values.watchedNamespaces | quote}} - name: LEADER_ELECTION_NAMESPACE - value: {{.Values.operatorNamespace}} + value: {{.Values.operatorNamespace | quote}} - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: OPERATOR_NAME - value: {{.Values.operatorNamespace}} + value: {{.Values.operatorNamespace | quote}} --- diff --git a/charts/kubezero-istio/charts/istio-operator/values.yaml b/charts/kubezero-istio/charts/istio-operator/values.yaml index 6a653f51..aa5d70ae 100644 --- a/charts/kubezero-istio/charts/istio-operator/values.yaml +++ b/charts/kubezero-istio/charts/istio-operator/values.yaml @@ -1,4 +1,5 @@ hub: gcr.io/istio-testing tag: 1.6-dev operatorNamespace: istio-operator -istioNamespace: istio-system +# Used to replace istioNamespace to support operator watch multiple namespaces. +watchedNamespaces: istio-system diff --git a/charts/kubezero-istio/delete_istio_14.sh b/charts/kubezero-istio/delete_istio_14.sh deleted file mode 100755 index 3078179a..00000000 --- a/charts/kubezero-istio/delete_istio_14.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# First delete old 1.4 -kubectl delete -f ingress-gateway.yaml -kubectl delete -f istio.yaml -kubectl delete -f istio-init.yaml -kubectl delete -f namespace.yaml diff --git a/charts/kubezero-istio/templates/istio-base.yaml b/charts/kubezero-istio/templates/istio-base.yaml index fdfc5770..2aebcc80 100644 --- a/charts/kubezero-istio/templates/istio-base.yaml +++ b/charts/kubezero-istio/templates/istio-base.yaml @@ -5220,6 +5220,68 @@ spec: storage: true --- + +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: istiooperators.install.istio.io + labels: + release: istio +spec: + additionalPrinterColumns: + - JSONPath: .spec.revision + description: Istio control plane revision + name: Revision + type: string + - JSONPath: .metadata.creationTimestamp + description: 'CreationTimestamp is a timestamp representing the server time when + this object was created. It is not guaranteed to be set in happens-before order + across separate operations. Clients may not set this value. It is represented + in RFC3339 form and is in UTC. Populated by the system. Read-only. Null for + lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata' + name: Age + type: date + group: install.istio.io + names: + kind: IstioOperator + plural: istiooperators + singular: istiooperator + shortNames: + - iop + scope: Namespaced + subresources: + status: {} + validation: + openAPIV3Schema: + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. + More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. + More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + spec: + description: 'Specification of the desired state of the istio control plane resource. + More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' + type: object + status: + description: 'Status describes each of istio control plane component status at the current time. + 0 means NONE, 1 means UPDATING, 2 means HEALTHY, 3 means ERROR, 4 means RECONCILING. + More info: https://github.com/istio/api/blob/master/operator/v1alpha1/istio.operator.v1alpha1.pb.html & + https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' + type: object + versions: + - name: v1alpha1 + served: true + storage: true +--- + # Cni component is disabled. # EgressGateways istio-egressgateway component is disabled. diff --git a/charts/kubezero-istio/update.sh b/charts/kubezero-istio/update.sh index 199a6780..65f10afb 100755 --- a/charts/kubezero-istio/update.sh +++ b/charts/kubezero-istio/update.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ex -ISTIO_VERSION=1.6.7 +ISTIO_VERSION=1.6.9 NAME="istio-$ISTIO_VERSION" URL="https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux-amd64.tar.gz" diff --git a/charts/kubezero-istio/values.yaml b/charts/kubezero-istio/values.yaml index c179f3d2..61379acc 100644 --- a/charts/kubezero-istio/values.yaml +++ b/charts/kubezero-istio/values.yaml @@ -14,4 +14,4 @@ ingress: istio-operator: hub: docker.io/istio - tag: 1.6.7 + tag: 1.6.9