Skip to content

Commit

Permalink
Automated merge
Browse files Browse the repository at this point in the history 
* upstream/main:
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#444)

# Conflicts:
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/values.yaml
  • Loading branch information
openshift-service-mesh-bot committed Oct 23, 2024
2 parents 13a6055 + 06bb204 commit 24c3590
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
View file
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/maistra-dev/sail-operator:3.0-latest
createdAt: "2024-10-22T07:59:18Z"
createdAt: "2024-10-23T12:08:25Z"
description: The OpenShift Service Mesh Operator enables you to install, configure,
and manage an instance of Red Hat OpenShift Service Mesh. OpenShift Service
Mesh is based on the open source Istio project.
Expand Down
2 changes: 1 addition & 1 deletion chart/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ csv:
- v1.23.2
- v1.22.5
- v1.21.6
- latest (ec2e6252)
- latest (bb972b54)
[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 go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ require (
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.16.1
istio.io/client-go v1.24.0-alpha.0.0.20241018201953-b3ca3b2a6ef6
istio.io/istio v0.0.0-20241022021630-ec2e62526733
istio.io/istio v0.0.0-20241022213331-bb972b546125
k8s.io/api v0.31.1
k8s.io/apiextensions-apiserver v0.31.1
k8s.io/apimachinery v0.31.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,8 @@ istio.io/api v1.24.0-alpha.0.0.20241018201654-7c8ec5b5ab72 h1:AVg/4p5sVhZT6JwBcz
istio.io/api v1.24.0-alpha.0.0.20241018201654-7c8ec5b5ab72/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I=
istio.io/client-go v1.24.0-alpha.0.0.20241018201953-b3ca3b2a6ef6 h1:qVjgBbqg19vZCpeTMQR0QM8SRfLZTtaSXgWbnWRb0fo=
istio.io/client-go v1.24.0-alpha.0.0.20241018201953-b3ca3b2a6ef6/go.mod h1:usBQZ/vvpGAUA6yGiz6x9ufG50gRC9v0332MesA/lNw=
istio.io/istio v0.0.0-20241022021630-ec2e62526733 h1:cdU+BxXv4/OUe9CPHxqOVQit5D9+Ua5zKSC7WOCRk9g=
istio.io/istio v0.0.0-20241022021630-ec2e62526733/go.mod h1:HIYMYxUxROUbBMwgNfV6QmZmVBn2soLee2eigSAMCbM=
istio.io/istio v0.0.0-20241022213331-bb972b546125 h1:mliFVPGvuQ9XCZZIG9fSQsI1AVJqz6MUIWQVAlM3MJI=
istio.io/istio v0.0.0-20241022213331-bb972b546125/go.mod h1:27Ub5DbzERxmDSo6hWl+/eaSKOmO3UctQ7c0TPtKUFU=
k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40=
Expand Down
14 changes: 7 additions & 7 deletions versions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,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.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde
version: 1.24-alpha.bb972b546125d3f001cc11114e9fc95486b891ec
repo: https://github.com/istio/istio
branch: master
commit: ec2e62526733486e241640b69789cd4a145ecbde
commit: bb972b546125d3f001cc11114e9fc95486b891ec
charts:
- https://storage.googleapis.com/istio-build/dev/1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde/helm/base-1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde.tgz
- https://storage.googleapis.com/istio-build/dev/1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde/helm/cni-1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde.tgz
- https://storage.googleapis.com/istio-build/dev/1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde/helm/gateway-1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde.tgz
- https://storage.googleapis.com/istio-build/dev/1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde/helm/istiod-1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde.tgz
- https://storage.googleapis.com/istio-build/dev/1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde/helm/ztunnel-1.24-alpha.ec2e62526733486e241640b69789cd4a145ecbde.tgz
- https://storage.googleapis.com/istio-build/dev/1.24-alpha.bb972b546125d3f001cc11114e9fc95486b891ec/helm/base-1.24-alpha.bb972b546125d3f001cc11114e9fc95486b891ec.tgz
- https://storage.googleapis.com/istio-build/dev/1.24-alpha.bb972b546125d3f001cc11114e9fc95486b891ec/helm/cni-1.24-alpha.bb972b546125d3f001cc11114e9fc95486b891ec.tgz
- https://storage.googleapis.com/istio-build/dev/1.24-alpha.bb972b546125d3f001cc11114e9fc95486b891ec/helm/gateway-1.24-alpha.bb972b546125d3f001cc11114e9fc95486b891ec.tgz
- https://storage.googleapis.com/istio-build/dev/1.24-alpha.bb972b546125d3f001cc11114e9fc95486b891ec/helm/istiod-1.24-alpha.bb972b546125d3f001cc11114e9fc95486b891ec.tgz
- https://storage.googleapis.com/istio-build/dev/1.24-alpha.bb972b546125d3f001cc11114e9fc95486b891ec/helm/ztunnel-1.24-alpha.bb972b546125d3f001cc11114e9fc95486b891ec.tgz

0 comments on commit 24c3590

Please sign in to comment.