Skip to content

Commit

Permalink
Automator: Update dependencies in istio-ecosystem/sail-operator@main
Browse files Browse the repository at this point in the history
Signed-off-by: openshift-service-mesh-bot <[email protected]>
  • Loading branch information
openshift-service-mesh-bot committed Jan 23, 2025
1 parent 7c54546 commit 722ead5
Show file tree
Hide file tree
Showing 16 changed files with 45 additions and 36 deletions.
20 changes: 10 additions & 10 deletions bundle/manifests/sailoperator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ metadata:
capabilities: Seamless Upgrades
categories: OpenShift Optional, Integration & Delivery, Networking, Security
containerImage: quay.io/sail-dev/sail-operator:0.3-latest
createdAt: "2025-01-22T05:05:44Z"
createdAt: "2025-01-23T05:05:18Z"
description: Experimental operator for installing Istio service mesh
features.operators.openshift.io/cnf: "false"
features.operators.openshift.io/cni: "true"
Expand Down Expand Up @@ -373,7 +373,7 @@ spec:
- v1.22.6
- v1.22.5
- v1.21.6
- latest (ad7809a2)
- latest (2c07df56)
[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
Expand Down Expand Up @@ -649,10 +649,10 @@ spec:
template:
metadata:
annotations:
images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
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
Expand Down Expand Up @@ -822,13 +822,13 @@ spec:
provider:
name: Red Hat, Inc.
relatedImages:
- image: gcr.io/istio-testing/install-cni:1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
- image: gcr.io/istio-testing/install-cni:1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
name: latest.cni
- image: gcr.io/istio-testing/pilot:1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
- image: gcr.io/istio-testing/pilot:1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
name: latest.istiod
- image: gcr.io/istio-testing/proxyv2:1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
- image: gcr.io/istio-testing/proxyv2:1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
name: latest.proxy
- image: gcr.io/istio-testing/ztunnel:1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
- image: gcr.io/istio-testing/ztunnel:1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
name: latest.ztunnel
- image: docker.io/istio/install-cni:1.21.6
name: v1_21_6.cni
Expand Down
2 changes: 1 addition & 1 deletion chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ csv:
- v1.22.6
- v1.22.5
- v1.21.6
- latest (ad7809a2)
- latest (2c07df56)
[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
Expand Down
2 changes: 1 addition & 1 deletion common/.commonfiles.sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0534ded1b742f889f515f2c651122889c382aac4
4a811c922d5823525dc271fa6defd1978bf73286
9 changes: 9 additions & 0 deletions common/scripts/kind_provisioner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,16 @@ function setup_kind_cluster() {
kind create cluster --name="${NAME}" -v4 --retain --image "${IMAGE}" ${KIND_WAIT_FLAG:+"$KIND_WAIT_FLAG"} --config -); then
echo "Could not setup KinD environment. Something wrong with KinD setup. Exporting logs."
return 9
# kubectl config set clusters.kind-istio-testing.server https://istio-testing-control-plane:6443
fi

if [[ -n "${DEVCONTAINER}" ]]; then
# identify our docker container id using proc and regex
containerid=$(grep 'resolv.conf' /proc/self/mountinfo | sed 's/.*\/docker\/containers\/\([0-9a-f]*\).*/\1/')
docker network connect kind "$containerid"
kind export kubeconfig --name="${NAME}" --internal
fi

# Workaround kind issue causing taints to not be removed in 1.24
kubectl taint nodes "${NAME}"-control-plane node-role.kubernetes.io/control-plane- 2>/dev/null || true

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.16.3
istio.io/client-go v1.25.0-alpha.0.0.20250103213757-fb95213c2bc2
istio.io/istio v0.0.0-20250122020456-ad7809a27990
istio.io/istio v0.0.0-20250123022502-2c07df5692b5
k8s.io/api v0.32.0
k8s.io/apiextensions-apiserver v0.32.0
k8s.io/apimachinery v0.32.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -520,8 +520,8 @@ istio.io/api v1.24.0-alpha.0.0.20250103213058-f293e9c39285 h1:HMEJDYg8lxp2g/I7oH
istio.io/api v1.24.0-alpha.0.0.20250103213058-f293e9c39285/go.mod h1:QFzEXv/IT582T0FHZVp1QoolvE4ws0zz/vVO55blmlE=
istio.io/client-go v1.25.0-alpha.0.0.20250103213757-fb95213c2bc2 h1:lLGNyELRQJtgqFT6ibd2bEsIgDRKBZ+iQMrOgMY/q1s=
istio.io/client-go v1.25.0-alpha.0.0.20250103213757-fb95213c2bc2/go.mod h1:SxwtgVDTEray23wIAmsXnzpXiKckYH3G+TISxorESUo=
istio.io/istio v0.0.0-20250122020456-ad7809a27990 h1:RUqpwtQl7SCYh3cSoOzgPTQqem3kYjPTQfPYEsvbJn4=
istio.io/istio v0.0.0-20250122020456-ad7809a27990/go.mod h1:gwxuNcyDdTWkypGK2J6ENSeGrNfIzWBsxGLsm5MHpRA=
istio.io/istio v0.0.0-20250123022502-2c07df5692b5 h1:qm6lhFhxGYSeqHoycqKSNnWxFyMy8buMA9fodThLhdQ=
istio.io/istio v0.0.0-20250123022502-2c07df5692b5/go.mod h1:gwxuNcyDdTWkypGK2J6ENSeGrNfIzWBsxGLsm5MHpRA=
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=
Expand Down
4 changes: 2 additions & 2 deletions resources/latest/charts/base/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: v2
appVersion: 1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
appVersion: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
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.ad7809a279900cd2922437b2d5b26da7bd47fe4f
version: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
4 changes: 2 additions & 2 deletions resources/latest/charts/cni/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
appVersion: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
description: Helm chart for istio-cni components
icon: https://istio.io/latest/favicons/android-192x192.png
keywords:
Expand All @@ -8,4 +8,4 @@ keywords:
name: cni
sources:
- https://github.com/istio/istio
version: 1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
version: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
2 changes: 1 addition & 1 deletion resources/latest/charts/cni/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ _internal_defaults_do_not_set:
hub: gcr.io/istio-testing

# Default tag for Istio images.
tag: 1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
tag: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8

# Variant of the image to use.
# Currently supported are: [debug, distroless]
Expand Down
4 changes: 2 additions & 2 deletions resources/latest/charts/gateway/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
appVersion: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
description: Helm chart for deploying Istio gateways
icon: https://istio.io/latest/favicons/android-192x192.png
keywords:
Expand All @@ -9,4 +9,4 @@ name: gateway
sources:
- https://github.com/istio/istio
type: application
version: 1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
version: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
4 changes: 2 additions & 2 deletions resources/latest/charts/istiod/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
appVersion: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
description: Helm chart for istio control plane
icon: https://istio.io/latest/favicons/android-192x192.png
keywords:
Expand All @@ -9,4 +9,4 @@ keywords:
name: istiod
sources:
- https://github.com/istio/istio
version: 1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
version: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
2 changes: 1 addition & 1 deletion resources/latest/charts/istiod/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.ad7809a279900cd2922437b2d5b26da7bd47fe4f
tag: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
# Variant of the image to use.
# Currently supported are: [debug, distroless]
variant: ""
Expand Down
2 changes: 1 addition & 1 deletion resources/latest/charts/revisiontags/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.ad7809a279900cd2922437b2d5b26da7bd47fe4f
tag: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
# Variant of the image to use.
# Currently supported are: [debug, distroless]
variant: ""
Expand Down
4 changes: 2 additions & 2 deletions resources/latest/charts/ztunnel/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
appVersion: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
description: Helm chart for istio ztunnel components
icon: https://istio.io/latest/favicons/android-192x192.png
keywords:
Expand All @@ -8,4 +8,4 @@ keywords:
name: ztunnel
sources:
- https://github.com/istio/istio
version: 1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f
version: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
2 changes: 1 addition & 1 deletion resources/latest/charts/ztunnel/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.ad7809a279900cd2922437b2d5b26da7bd47fe4f
tag: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
# Variant to pull. Options are "debug" or "distroless". Unset will use the default for the given version.
variant: ""

Expand Down
14 changes: 7 additions & 7 deletions versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.ad7809a279900cd2922437b2d5b26da7bd47fe4f
version: 1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8
repo: https://github.com/istio/istio
branch: master
commit: ad7809a279900cd2922437b2d5b26da7bd47fe4f
commit: 2c07df5692b52f476cd9d8cd6410358148c717b8
charts:
- https://storage.googleapis.com/istio-build/dev/1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f/helm/base-1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f.tgz
- https://storage.googleapis.com/istio-build/dev/1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f/helm/cni-1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f.tgz
- https://storage.googleapis.com/istio-build/dev/1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f/helm/gateway-1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f.tgz
- https://storage.googleapis.com/istio-build/dev/1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f/helm/istiod-1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f.tgz
- https://storage.googleapis.com/istio-build/dev/1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f/helm/ztunnel-1.25-alpha.ad7809a279900cd2922437b2d5b26da7bd47fe4f.tgz
- https://storage.googleapis.com/istio-build/dev/1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8/helm/base-1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8.tgz
- https://storage.googleapis.com/istio-build/dev/1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8/helm/cni-1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8.tgz
- https://storage.googleapis.com/istio-build/dev/1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8/helm/gateway-1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8.tgz
- https://storage.googleapis.com/istio-build/dev/1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8/helm/istiod-1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8.tgz
- https://storage.googleapis.com/istio-build/dev/1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8/helm/ztunnel-1.25-alpha.2c07df5692b52f476cd9d8cd6410358148c717b8.tgz

0 comments on commit 722ead5

Please sign in to comment.