Automator: Update dependencies in istio-ecosystem/sail-operator@main

Signed-off-by: openshift-service-mesh-bot <[email protected]>

Makefile.core.mk

@@ -477,7 +477,7 @@ HELM_VERSION ?= v3.16.4
 CONTROLLER_TOOLS_VERSION ?= v0.16.5
 OPM_VERSION ?= v1.49.0
 OLM_VERSION ?= v0.30.0
-GITLEAKS_VERSION ?= v8.21.2
+GITLEAKS_VERSION ?= v8.22.0
 ISTIOCTL_VERSION ?= 1.23.0
 
 # GENERATE_RELATED_IMAGES defines whether `spec.relatedImages` is going to be generated or not

bundle/manifests/sailoperator.clusterserviceversion.yaml

@@ -34,7 +34,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: OpenShift Optional, Integration & Delivery, Networking, Security
     containerImage: quay.io/maistra-dev/sail-operator:0.3-latest
-    createdAt: "2024-12-19T05:05:23Z"
+    createdAt: "2024-12-27T05:05:26Z"
     description: Experimental operator for installing Istio service mesh
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "true"
@@ -371,7 +371,7 @@ spec:
     - v1.22.6
     - v1.22.5
     - v1.21.6
-    - latest (d547b858)
+    - latest (1d35728c)
 
     [See this page](https://github.com/istio-ecosystem/sail-operator/blob/main/bundle/README.md) for instructions on how to use it.
   displayName: Sail Operator
@@ -647,10 +647,10 @@ spec:
           template:
             metadata:
               annotations:
-                images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
-                images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
-                images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
-                images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+                images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
+                images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
+                images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
+                images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
                 images.v1_21_6.cni: docker.io/istio/install-cni:1.21.6
                 images.v1_21_6.istiod: docker.io/istio/pilot:1.21.6
                 images.v1_21_6.proxy: docker.io/istio/proxyv2:1.21.6
@@ -843,13 +843,13 @@ spec:
   provider:
     name: Red Hat, Inc.
   relatedImages:
-  - image: gcr.io/istio-testing/install-cni:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+  - image: gcr.io/istio-testing/install-cni:1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
     name: latest.cni
-  - image: gcr.io/istio-testing/pilot:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+  - image: gcr.io/istio-testing/pilot:1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
     name: latest.istiod
-  - image: gcr.io/istio-testing/proxyv2:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+  - image: gcr.io/istio-testing/proxyv2:1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
     name: latest.proxy
-  - image: gcr.io/istio-testing/ztunnel:1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+  - image: gcr.io/istio-testing/ztunnel:1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
     name: latest.ztunnel
   - image: docker.io/istio/install-cni:1.21.6
     name: v1_21_6.cni

chart/values.yaml

@@ -28,7 +28,7 @@ csv:
     - v1.22.6
     - v1.22.5
     - v1.21.6
-    - latest (d547b858)
+    - latest (1d35728c)
 
     [See this page](https://github.com/istio-ecosystem/sail-operator/blob/main/bundle/README.md) for instructions on how to use it.
   support: Community based

go.mod

@@ -25,8 +25,8 @@ require (
 	gomodules.xyz/jsonpatch/v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.16.3
-	istio.io/client-go v1.24.0-alpha.0.0.20241218215832-3daa0126820b
-	istio.io/istio v0.0.0-20241219014932-d547b8580cf6
+	istio.io/client-go v1.24.0-alpha.0.0.20241223172145-968440ca4242
+	istio.io/istio v0.0.0-20241227013049-1d35728cea08
 	k8s.io/api v0.32.0
 	k8s.io/apiextensions-apiserver v0.32.0
 	k8s.io/apimachinery v0.32.0

go.sum

@@ -496,10 +496,10 @@ helm.sh/helm/v3 v3.16.3 h1:kb8bSxMeRJ+knsK/ovvlaVPfdis0X3/ZhYCSFRP+YmY=
 helm.sh/helm/v3 v3.16.3/go.mod h1:zeVWGDR4JJgiRbT3AnNsjYaX8OTJlIE9zC+Q7F7iUSU=
 istio.io/api v1.24.0-alpha.0.0.20241218215532-27d505cbdb11 h1:AlkTHCbrikiyS6Pz4Qke8+yXEOpgpC8kRMBaBClAIpg=
 istio.io/api v1.24.0-alpha.0.0.20241218215532-27d505cbdb11/go.mod h1:QFzEXv/IT582T0FHZVp1QoolvE4ws0zz/vVO55blmlE=
-istio.io/client-go v1.24.0-alpha.0.0.20241218215832-3daa0126820b h1:c8USLMmfK3eOUbQ4ut9nT4fnX48nx4mUc7q2AMu5Ppo=
-istio.io/client-go v1.24.0-alpha.0.0.20241218215832-3daa0126820b/go.mod h1:SETUIw6SAGTLesSeed9N0SbW+72RoYB1J9LHuWgpMkQ=
-istio.io/istio v0.0.0-20241219014932-d547b8580cf6 h1:HN+KGGjBUnAY/oAcuAJgZITuwIajFZdPYyxyefozmyg=
-istio.io/istio v0.0.0-20241219014932-d547b8580cf6/go.mod h1:TiOIr/B86DoFGpimy1QGCrQbCT4XCJIbZ9fvs1mZ7AU=
+istio.io/client-go v1.24.0-alpha.0.0.20241223172145-968440ca4242 h1:gBmqMiltQCalHIeeGHeELfI+1/1uel0iFW05ByowjV8=
+istio.io/client-go v1.24.0-alpha.0.0.20241223172145-968440ca4242/go.mod h1:SETUIw6SAGTLesSeed9N0SbW+72RoYB1J9LHuWgpMkQ=
+istio.io/istio v0.0.0-20241227013049-1d35728cea08 h1:7MMe7KeZP9ilLvuHR2oHVSIvZly9yXs2DJozVtTfIpc=
+istio.io/istio v0.0.0-20241227013049-1d35728cea08/go.mod h1:TiOIr/B86DoFGpimy1QGCrQbCT4XCJIbZ9fvs1mZ7AU=
 k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
 k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
 k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2SWNOE0=

resources/latest/charts/base/Chart.yaml

@@ -1,10 +1,10 @@
 apiVersion: v2
-appVersion: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+appVersion: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
 description: Helm chart for deploying Istio cluster resources and CRDs
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
 - istio
 name: base
 sources:
 - https://github.com/istio/istio
-version: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+version: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc

resources/latest/charts/cni/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+appVersion: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
 description: Helm chart for istio-cni components
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
@@ -8,4 +8,4 @@ keywords:
 name: cni
 sources:
 - https://github.com/istio/istio
-version: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+version: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc

resources/latest/charts/cni/templates/clusterrole.yaml

@@ -18,7 +18,7 @@ rules:
 - apiGroups: [""]
   resources: ["pods","nodes","namespaces"]
   verbs: ["get", "list", "watch"]
-{{- if (eq (coalesce .Values.platform .Values.global.platform) "openshift") }}
+{{- if (eq ((coalesce .Values.platform .Values.global.platform) | default "") "openshift") }}
 - apiGroups: ["security.openshift.io"]
   resources: ["securitycontextconstraints"]
   resourceNames: ["privileged"]

resources/latest/charts/cni/templates/configmap-cni.yaml

@@ -16,6 +16,7 @@ data:
   AMBIENT_ENABLED: {{ .Values.ambient.enabled | quote }}
   AMBIENT_DNS_CAPTURE: {{ .Values.ambient.dnsCapture | default "false" | quote  }}
   AMBIENT_IPV6: {{ .Values.ambient.ipv6 | default "false" | quote }}
+  AMBIENT_RECONCILE_POD_RULES_ON_STARTUP: {{ .Values.ambient.reconcileIptablesOnStartup | default "false" | quote }}
   {{- if .Values.cniConfFileName }} # K8S < 1.24 doesn't like empty values
   CNI_CONF_NAME: {{ .Values.cniConfFileName }} # Name of the CNI config file to create. Only override if you know the exact path your CNI requires..
   {{- end }}

resources/latest/charts/cni/values.yaml

@@ -51,6 +51,8 @@ _internal_defaults_do_not_set:
     dnsCapture: false
     # If enabled, and ambient is enabled, enables ipv6 support
     ipv6: true
+    # If enabled, and ambient is enabled, the CNI agent will reconcile incompatible iptables rules and chains at startup.
+    reconcileIptablesOnStartup: false
 
 
   repair:
@@ -113,7 +115,7 @@ _internal_defaults_do_not_set:
     hub: gcr.io/istio-testing
 
     # Default tag for Istio images.
-    tag: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+    tag: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
 
     # Variant of the image to use.
     # Currently supported are: [debug, distroless]

resources/latest/charts/gateway/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+appVersion: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
 description: Helm chart for deploying Istio gateways
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
@@ -9,4 +9,4 @@ name: gateway
 sources:
 - https://github.com/istio/istio
 type: application
-version: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+version: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc

resources/latest/charts/gateway/templates/deployment.yaml

@@ -77,7 +77,7 @@ spec:
             allowPrivilegeEscalation: false
             privileged: false
             readOnlyRootFilesystem: true
-            {{- if not (eq .Values.platform "openshift") }}
+            {{- if not (eq (.Values.platform | default "") "openshift") }}
             runAsUser: 1337
             runAsGroup: 1337
             {{- end }}

resources/latest/charts/istiod/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+appVersion: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
 description: Helm chart for istio control plane
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
@@ -9,4 +9,4 @@ keywords:
 name: istiod
 sources:
 - https://github.com/istio/istio
-version: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+version: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc

resources/latest/charts/istiod/files/injection-template.yaml

@@ -52,7 +52,7 @@ metadata:
     sidecar.istio.io/interceptionMode: "{{ annotation .ObjectMeta `sidecar.istio.io/interceptionMode` .ProxyConfig.InterceptionMode }}",
     {{ with annotation .ObjectMeta `traffic.sidecar.istio.io/includeOutboundIPRanges` .Values.global.proxy.includeIPRanges }}traffic.sidecar.istio.io/includeOutboundIPRanges: "{{.}}",{{ end }}
     {{ with annotation .ObjectMeta `traffic.sidecar.istio.io/excludeOutboundIPRanges` .Values.global.proxy.excludeIPRanges }}traffic.sidecar.istio.io/excludeOutboundIPRanges: "{{.}}",{{ end }}
-    {{ with annotation .ObjectMeta `traffic.sidecar.istio.io/includeInboundPorts` .Values.global.proxy.includeInboundPorts }}traffic.sidecar.istio.io/includeInboundPorts: "{{.}}",{{ end }}
+    traffic.sidecar.istio.io/includeInboundPorts: "{{ annotation .ObjectMeta `traffic.sidecar.istio.io/includeInboundPorts` .Values.global.proxy.includeInboundPorts }}",
     traffic.sidecar.istio.io/excludeInboundPorts: "{{ excludeInboundPort (annotation .ObjectMeta `status.sidecar.istio.io/port` .Values.global.proxy.statusPort) (annotation .ObjectMeta `traffic.sidecar.istio.io/excludeInboundPorts` .Values.global.proxy.excludeInboundPorts) }}",
     {{ if or (isset .ObjectMeta.Annotations `traffic.sidecar.istio.io/includeOutboundPorts`) (ne (valueOrDefault .Values.global.proxy.includeOutboundPorts "") "") }}
     traffic.sidecar.istio.io/includeOutboundPorts: "{{ annotation .ObjectMeta `traffic.sidecar.istio.io/includeOutboundPorts` .Values.global.proxy.includeOutboundPorts }}",

resources/latest/charts/istiod/values.yaml

@@ -242,7 +242,7 @@ _internal_defaults_do_not_set:
     # Dev builds from prow are on gcr.io
     hub: gcr.io/istio-testing
     # Default tag for Istio images.
-    tag: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+    tag: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
     # Variant of the image to use.
     # Currently supported are: [debug, distroless]
     variant: ""

resources/latest/charts/revisiontags/values.yaml

@@ -242,7 +242,7 @@ _internal_defaults_do_not_set:
     # Dev builds from prow are on gcr.io
     hub: gcr.io/istio-testing
     # Default tag for Istio images.
-    tag: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+    tag: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
     # Variant of the image to use.
     # Currently supported are: [debug, distroless]
     variant: ""

resources/latest/charts/ztunnel/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+appVersion: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
 description: Helm chart for istio ztunnel components
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
@@ -8,4 +8,4 @@ keywords:
 name: ztunnel
 sources:
 - https://github.com/istio/istio
-version: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+version: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc

resources/latest/charts/ztunnel/templates/rbac.yaml

@@ -21,7 +21,7 @@ metadata:
     {{- .Values.annotations | toYaml | nindent 4 }}
 {{- end }}
 ---
-{{- if (eq .Values.platform "openshift") }}
+{{- if (eq (.Values.platform | default "") "openshift") }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

resources/latest/charts/ztunnel/values.yaml

@@ -4,7 +4,7 @@ _internal_defaults_do_not_set:
   # Hub to pull from. Image will be `Hub/Image:Tag-Variant`
   hub: gcr.io/istio-testing
   # Tag to pull from. Image will be `Hub/Image:Tag-Variant`
-  tag: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+  tag: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
   # Variant to pull. Options are "debug" or "distroless". Unset will use the default for the given version.
   variant: ""
 

versions.yaml

@@ -115,13 +115,13 @@ versions:
       - https://istio-release.storage.googleapis.com/charts/cni-1.21.6.tgz
       - https://istio-release.storage.googleapis.com/charts/ztunnel-1.21.6.tgz
   - name: latest
-    version: 1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea
+    version: 1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc
     repo: https://github.com/istio/istio
     branch: master
-    commit: d547b8580cf6298e15ba732823b2e027071516ea
+    commit: 1d35728cea08d5b9a23bde94672ebca44be328bc
     charts:
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea/helm/base-1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea/helm/cni-1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea/helm/gateway-1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea/helm/istiod-1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea.tgz
-      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea/helm/ztunnel-1.25-alpha.d547b8580cf6298e15ba732823b2e027071516ea.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc/helm/base-1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc/helm/cni-1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc/helm/gateway-1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc/helm/istiod-1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc.tgz
+      - https://storage.googleapis.com/istio-build/dev/1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc/helm/ztunnel-1.25-alpha.1d35728cea08d5b9a23bde94672ebca44be328bc.tgz