Skip to content

Commit

Permalink
bump istio version to 1.17.8 and prepare release v2.17.4
Browse files Browse the repository at this point in the history
  • Loading branch information
waynz0r committed Jan 31, 2024
1 parent 5194f20 commit f1f290a
Show file tree
Hide file tree
Showing 33 changed files with 53 additions and 50 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ GOLANGCI_VERSION = 1.54.2
LICENSEI_VERSION = 0.9.0
ENVTEST_K8S_VERSION = 1.26.0
KUSTOMIZE_VERSION = 4.1.2
ISTIO_VERSION = 1.17.1
ISTIO_VERSION = 1.17.8
BUF_VERSION = 1.7.0

PATH := $(PWD)/bin:$(PATH)
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/istiocontrolplane.gen.json
Original file line number Diff line number Diff line change
Expand Up @@ -1583,7 +1583,7 @@
"type": "string"
},
"credentialName": {
"description": "The name of the secret that holds the TLS certs for the client including the CA certificates. Secret must exist in the same namespace with the proxy using the certificates. The secret (of type `generic`)should contain the following keys and values: `key: \u003cprivateKey\u003e`, `cert: \u003cclientCert\u003e`, `cacert: \u003cCACertificate\u003e`. Here CACertificate is used to verify the server certificate. Secret of type tls for client certificates along with ca.crt key for CA certificates is also supported. Only one of client certificates and CA certificate or credentialName can be specified. **NOTE:** This field is applicable at sidecars only if `DestinationRule` has a `workloadSelector` specified. Otherwise the field will be applicable only at gateways, and sidecars will continue to use the certificate paths.",
"description": "The name of the secret that holds the TLS certs for the client including the CA certificates. Secret must exist in the same namespace with the proxy using the certificates. The secret (of type `generic`)should contain the following keys and values: `key: \u003cprivateKey\u003e`, `cert: \u003cclientCert\u003e`, `cacert: \u003cCACertificate\u003e`. Here CACertificate is used to verify the server certificate. For mutual TLS, `cacert: \u003cCACertificate\u003e` can be provided in the same secret or a separate secret named `\u003csecret\u003e-cacert`. Secret of type tls for client certificates along with ca.crt key for CA certificates is also supported. Only one of client certificates and CA certificate or credentialName can be specified. **NOTE:** This field is applicable at sidecars only if `DestinationRule` has a `workloadSelector` specified. Otherwise the field will be applicable only at gateways, and sidecars will continue to use the certificate paths.",
"type": "string"
},
"subjectAltNames": {
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/istiomesh.gen.json
Original file line number Diff line number Diff line change
Expand Up @@ -1583,7 +1583,7 @@
"type": "string"
},
"credentialName": {
"description": "The name of the secret that holds the TLS certs for the client including the CA certificates. Secret must exist in the same namespace with the proxy using the certificates. The secret (of type `generic`)should contain the following keys and values: `key: \u003cprivateKey\u003e`, `cert: \u003cclientCert\u003e`, `cacert: \u003cCACertificate\u003e`. Here CACertificate is used to verify the server certificate. Secret of type tls for client certificates along with ca.crt key for CA certificates is also supported. Only one of client certificates and CA certificate or credentialName can be specified. **NOTE:** This field is applicable at sidecars only if `DestinationRule` has a `workloadSelector` specified. Otherwise the field will be applicable only at gateways, and sidecars will continue to use the certificate paths.",
"description": "The name of the secret that holds the TLS certs for the client including the CA certificates. Secret must exist in the same namespace with the proxy using the certificates. The secret (of type `generic`)should contain the following keys and values: `key: \u003cprivateKey\u003e`, `cert: \u003cclientCert\u003e`, `cacert: \u003cCACertificate\u003e`. Here CACertificate is used to verify the server certificate. For mutual TLS, `cacert: \u003cCACertificate\u003e` can be provided in the same secret or a separate secret named `\u003csecret\u003e-cacert`. Secret of type tls for client certificates along with ca.crt key for CA certificates is also supported. Only one of client certificates and CA certificate or credentialName can be specified. **NOTE:** This field is applicable at sidecars only if `DestinationRule` has a `workloadSelector` specified. Otherwise the field will be applicable only at gateways, and sidecars will continue to use the certificate paths.",
"type": "string"
},
"subjectAltNames": {
Expand Down
8 changes: 4 additions & 4 deletions config/crd/bases/istio-operator-crds.gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
"helm.sh/resource-policy": keep
name: istiocontrolplanes.servicemesh.cisco.com
labels:
resource.alpha.banzaicloud.io/revision: 1.17.1
resource.alpha.banzaicloud.io/revision: 1.17.8
spec:
group: servicemesh.cisco.com
names:
Expand Down Expand Up @@ -9434,7 +9434,7 @@ metadata:
"helm.sh/resource-policy": keep
name: peeristiocontrolplanes.servicemesh.cisco.com
labels:
resource.alpha.banzaicloud.io/revision: 1.17.1
resource.alpha.banzaicloud.io/revision: 1.17.8
spec:
group: servicemesh.cisco.com
names:
Expand Down Expand Up @@ -18859,7 +18859,7 @@ metadata:
"helm.sh/resource-policy": keep
name: istiomeshes.servicemesh.cisco.com
labels:
resource.alpha.banzaicloud.io/revision: 1.17.1
resource.alpha.banzaicloud.io/revision: 1.17.8
spec:
group: servicemesh.cisco.com
names:
Expand Down Expand Up @@ -20043,7 +20043,7 @@ metadata:
"helm.sh/resource-policy": keep
name: istiomeshgateways.servicemesh.cisco.com
labels:
resource.alpha.banzaicloud.io/revision: 1.17.1
resource.alpha.banzaicloud.io/revision: 1.17.8
spec:
group: servicemesh.cisco.com
names:
Expand Down
8 changes: 4 additions & 4 deletions config/samples/servicemesh_v1alpha1_istiocontrolplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: IstioControlPlane
metadata:
name: icp-v117x-sample
spec:
version: 1.17.1
version: 1.17.8
mode: ACTIVE
meshID: mesh1
networkName: network1
Expand All @@ -18,7 +18,7 @@ spec:
min: 1
max: 5
count: 1
image: "gcr.io/istio-release/pilot:1.17.1"
image: "gcr.io/istio-release/pilot:1.17.8"
resources:
requests:
cpu: 500m
Expand All @@ -42,7 +42,7 @@ spec:
operatorEndpoints:
enabled: false
proxy:
image: "gcr.io/istio-release/proxyv2:1.17.1"
image: "gcr.io/istio-release/proxyv2:1.17.8"
privileged: false
enableCoreDump: false
logLevel: "WARNING"
Expand All @@ -62,7 +62,7 @@ spec:
excludeInboundPorts: ""
excludeOutboundPorts: ""
proxyInit:
image: "gcr.io/istio-release/proxyv2:1.17.1"
image: "gcr.io/istio-release/proxyv2:1.17.8"
resources:
limits:
cpu: 2000m
Expand Down
4 changes: 2 additions & 2 deletions controllers/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ var _ = Describe("IsIstioVersionSupported()", func() {
Expect(controllers.IsIstioVersionSupported("1.17-dev")).To(BeTrue())
})
It("should accept micro versions", func() {
Expect(controllers.IsIstioVersionSupported("1.17.1")).To(BeTrue())
Expect(controllers.IsIstioVersionSupported("1.17.8")).To(BeTrue())
})
It("should accept micro versions with qualifier", func() {
Expect(controllers.IsIstioVersionSupported("1.17.1-dev")).To(BeTrue())
Expect(controllers.IsIstioVersionSupported("1.17.8-dev")).To(BeTrue())
})
})
4 changes: 2 additions & 2 deletions deploy/charts/istio-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ icon: https://istio.io/latest/img/istio-whitelogo-bluebackground-framed.svg
# Based on support status of Istio releases: https://istio.io/latest/docs/releases/supported-releases/#support-status-of-istio-releases
kubeVersion: ">= 1.23.0-0 < 1.27.0-0"

version: 2.1.5
appVersion: "v2.17.3"
version: 2.1.6
appVersion: "v2.17.4"
2 changes: 1 addition & 1 deletion deploy/charts/istio-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ The following table lists the configurable parameters of the Banzaicloud Istio O
| Parameter | Description | Default |
|------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------|
| `image.repository` | Operator container image repository | `ghcr.io/banzaicloud/istio-operator` |
| `image.tag` | Operator container image tag | `v2.17.3` |
| `image.tag` | Operator container image tag | `v2.17.4` |
| `image.pullPolicy` | Operator container image pull policy | `IfNotPresent` |
| `replicaCount` | Operator deployment replica count | `1` |
| `extraArgs` | Operator deployment arguments | `[]` |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
"helm.sh/resource-policy": keep
name: istiocontrolplanes.servicemesh.cisco.com
labels:
resource.alpha.banzaicloud.io/revision: 1.17.1
resource.alpha.banzaicloud.io/revision: 1.17.8
spec:
group: servicemesh.cisco.com
names:
Expand Down Expand Up @@ -9434,7 +9434,7 @@ metadata:
"helm.sh/resource-policy": keep
name: peeristiocontrolplanes.servicemesh.cisco.com
labels:
resource.alpha.banzaicloud.io/revision: 1.17.1
resource.alpha.banzaicloud.io/revision: 1.17.8
spec:
group: servicemesh.cisco.com
names:
Expand Down Expand Up @@ -18859,7 +18859,7 @@ metadata:
"helm.sh/resource-policy": keep
name: istiomeshes.servicemesh.cisco.com
labels:
resource.alpha.banzaicloud.io/revision: 1.17.1
resource.alpha.banzaicloud.io/revision: 1.17.8
spec:
group: servicemesh.cisco.com
names:
Expand Down Expand Up @@ -20043,7 +20043,7 @@ metadata:
"helm.sh/resource-policy": keep
name: istiomeshgateways.servicemesh.cisco.com
labels:
resource.alpha.banzaicloud.io/revision: 1.17.1
resource.alpha.banzaicloud.io/revision: 1.17.8
spec:
group: servicemesh.cisco.com
names:
Expand Down
2 changes: 1 addition & 1 deletion deploy/charts/istio-operator/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
image:
repository: ghcr.io/banzaicloud/istio-operator
tag: "v2.17.3"
tag: "v2.17.4"
pullPolicy: IfNotPresent
replicaCount: 1
extraArgs: []
Expand Down
2 changes: 1 addition & 1 deletion docs/multi-cluster-mesh/active-active/active-icp-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
annotations:
controlplane.istio.servicemesh.cisco.com/namespace-injection-source: "true"
spec:
version: 1.17.1
version: 1.17.8
mode: ACTIVE
networkName: network1
meshExpansion:
Expand Down
2 changes: 1 addition & 1 deletion docs/multi-cluster-mesh/active-active/active-icp-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: icp-v117x
namespace: istio-system
spec:
version: 1.17.1
version: 1.17.8
mode: ACTIVE
networkName: network2
meshExpansion:
Expand Down
2 changes: 1 addition & 1 deletion docs/multi-cluster-mesh/active-passive/active-icp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
annotations:
controlplane.istio.servicemesh.cisco.com/namespace-injection-source: "true"
spec:
version: 1.17.1
version: 1.17.8
mode: ACTIVE
networkName: network1
meshExpansion:
Expand Down
2 changes: 1 addition & 1 deletion docs/multi-cluster-mesh/active-passive/passive-icp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: icp-v117x
namespace: istio-system
spec:
version: 1.17.1
version: 1.17.8
mode: PASSIVE
networkName: network2
meshExpansion:
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ require (
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.24.1
go.uber.org/zap v1.24.0
istio.io/api v0.0.0-20230217221049-9d422bf48675
istio.io/client-go v1.17.1
istio.io/api v0.0.0-20231011001129-b6bd6cd1b885
istio.io/client-go v1.17.8
k8s.io/api v0.26.1
k8s.io/apiextensions-apiserver v0.26.1
k8s.io/apimachinery v0.26.1
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1194,10 +1194,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
istio.io/api v0.0.0-20230217221049-9d422bf48675 h1:dxHqYbJwurfq+x2OOG4WP+NkbyjURgcP9PQTsxh7HXM=
istio.io/api v0.0.0-20230217221049-9d422bf48675/go.mod h1:owGDRg9uqMob8CN1gxaOzk6nJxnbT8wrP7PmggpJHHY=
istio.io/client-go v1.17.1 h1:W0kQXYCzIluA/20zLzxeNF7bNMJXXArmGYRt/MIg2io=
istio.io/client-go v1.17.1/go.mod h1:mLTRYYFxHctzUbt8Iclgj+Sueq34+qC2ZEJTn6BxRuE=
istio.io/api v0.0.0-20231011001129-b6bd6cd1b885 h1:I8mtxnP4kp8leqQ4sel2AxWON5gw18W6h13aE9O5g7M=
istio.io/api v0.0.0-20231011001129-b6bd6cd1b885/go.mod h1:owGDRg9uqMob8CN1gxaOzk6nJxnbT8wrP7PmggpJHHY=
istio.io/client-go v1.17.8 h1:RtP3G8uPaFm+Q+NYXFcdiRSj5GwSZnh/WnhHOJmsp10=
istio.io/client-go v1.17.8/go.mod h1:rW8Lj0iHDvB0rXbryn6PNfYh3cK6ueeO47cm+Y23NCg=
k8s.io/api v0.24.3/go.mod h1:elGR/XSZrS7z7cSZPzVWaycpJuGIw57j9b95/1PdJNI=
k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg=
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
metadata:
sidecar.istio.io/rewriteAppHTTPProbers: "false"
annotations:
sidecar.istio.io/rewriteAppHTTPProbers: "false"
spec:
initContainers:
- name: grpc-bootstrap-init
Expand Down
2 changes: 1 addition & 1 deletion internal/assets/manifests/istio-discovery/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ global:
# Dev builds from prow are on gcr.io
hub: istio
# Default tag for Istio images.
tag: "1.17.1"
tag: "1.17.8"
# Variant of the image to use.
# Currently supported are: [debug, distroless]
variant: ""
Expand Down
2 changes: 1 addition & 1 deletion internal/components/base/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func TestICPBaseResourceDump(t *testing.T) {
reconciler.NativeReconcilerSetControllerRef(),
}),
logger.NewWithLogrLogger(logr.NewTestLogger(t)),
"1.17.1",
"1.17.8",
)

dd, err := reconciler.GetManifest(icp)
Expand Down
2 changes: 1 addition & 1 deletion internal/components/base/testdata/icp-test-cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ metadata:
name: cp-v117x
namespace: istio-system
spec:
version: "1.17.1"
version: "1.17.8"
mode: ACTIVE
2 changes: 1 addition & 1 deletion internal/components/cni/testdata/icp-test-cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: cp-v117x
namespace: istio-system
spec:
version: "1.17.1"
version: "1.17.8"
mode: ACTIVE
containerImageConfiguration:
hub: gcr.io/istio-testing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,8 @@ data:
{{- end }}
grpc-simple: |
metadata:
sidecar.istio.io/rewriteAppHTTPProbers: "false"
annotations:
sidecar.istio.io/rewriteAppHTTPProbers: "false"
spec:
initContainers:
- name: grpc-bootstrap-init
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,8 @@ data:
{{- end }}
grpc-simple: |
metadata:
sidecar.istio.io/rewriteAppHTTPProbers: "false"
annotations:
sidecar.istio.io/rewriteAppHTTPProbers: "false"
spec:
initContainers:
- name: grpc-bootstrap-init
Expand Down Expand Up @@ -1330,7 +1331,7 @@ data:
"sts": {
"servicePort": 0
},
"tag": "1.17.1",
"tag": "1.17.8",
"tracer": {
"datadog": {
"address": "$(HOST_IP):8126"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
value: custom-passive2
meshID: mesh1
clusterID: demo-cluster2
version: "1.17.1"
version: "1.17.8"
mode: PASSIVE
networkName: network1
caProvider: Citadel
2 changes: 1 addition & 1 deletion internal/components/discovery/testdata/icp-test-cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
value: custom2
meshID: mesh1
clusterID: demo-cluster1
version: "1.17.1"
version: "1.17.8"
mode: ACTIVE
networkName: network1
containerImageConfiguration:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
meshID: mesh1
clusterID: demo-cluster1
version: "1.17.1"
version: "1.17.8"
mode: ACTIVE
containerImageConfiguration:
hub: gcr.io/istio-testing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: cp-v117x
namespace: istio-system
spec:
version: "1.17.1"
version: "1.17.8"
mode: ACTIVE
networkName: network-bogus
distribution: cisco
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: cp-v117x
namespace: istio-system
spec:
version: "1.17.1"
version: "1.17.8"
mode: ACTIVE
distribution: cisco
meshID: mesh1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: cp-v117x
namespace: istio-system
spec:
version: "1.17.1"
version: "1.17.8"
mode: PASSIVE
distribution: cisco
meshID: mesh1
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ spec:
value: "true"
- name: CNI_ANOTHER_ENV_NAME
value: standard
image: banzaicloud/istio-sidecar-injector:v1.17.1-bzc.0
image: banzaicloud/istio-sidecar-injector:v1.17.8-bzc.0
imagePullPolicy: Always
livenessProbe:
exec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
revision: cp-v117x
deployment:
image: banzaicloud/istio-sidecar-injector:v1.17.1-bzc.0
image: banzaicloud/istio-sidecar-injector:v1.17.8-bzc.0
metadata:
annotations:
daemonset-annotation: value
Expand Down
4 changes: 2 additions & 2 deletions internal/components/sidecarinjector/testdata/icp-test-cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: cp-v117x
namespace: istio-system
spec:
version: "1.17.1"
version: "1.17.8"
mode: PASSIVE
distribution: cisco
containerImageConfiguration:
Expand All @@ -30,7 +30,7 @@ spec:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 1
image: banzaicloud/istio-sidecar-injector:v1.17.1-bzc.0
image: banzaicloud/istio-sidecar-injector:v1.17.8-bzc.0
env:
- name: CNI_ENV_NAME
value: "true"
Expand Down
Loading

0 comments on commit f1f290a

Please sign in to comment.