Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automator: merge upstream changes to openshift-service-mesh/sail-operator@main #67

Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Automator: Update dependencies in istio-ecosystem/sail-operator@main (i…
…stio-ecosystem#180)

Signed-off-by: istio-testing <istio-testing-bot@google.com>
  • Loading branch information
istio-testing authored Jun 26, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 887a9313e780454c1124645220aa3348ad28c168
4 changes: 2 additions & 2 deletions bundle/manifests/sailoperator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ metadata:
capabilities: Seamless Upgrades
categories: OpenShift Optional, Integration & Delivery, Networking, Security
containerImage: quay.io/maistra-dev/sail-operator:0.1-latest
createdAt: "2024-06-25T23:02:31Z"
createdAt: "2024-06-26T23:05:38Z"
description: Experimental operator for installing Istio service mesh
features.operators.openshift.io/cnf: "false"
features.operators.openshift.io/cni: "true"
@@ -306,7 +306,7 @@ spec:
- v1.21.3
- v1.21.2
- v1.21.0
- latest (ddb336cc)
- latest (1c596330)

[See this page](https://github.com/istio-ecosystem/sail-operator/blob/pre-main/bundle/README.md) for instructions on how to use it.
displayName: Sail Operator
2 changes: 1 addition & 1 deletion chart/values.yaml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ csv:
- v1.21.3
- v1.21.2
- v1.21.0
- latest (ddb336cc)
- latest (1c596330)

[See this page](https://github.com/istio-ecosystem/sail-operator/blob/pre-main/bundle/README.md) for instructions on how to use it.
support: Community based
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ require (
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.15.1
istio.io/client-go v1.22.0-alpha.1.0.20240620154436-0945d7438eb2
istio.io/istio v0.0.0-20240625173720-ddb336cc9e72
istio.io/istio v0.0.0-20240626221714-1c5963301ae4
k8s.io/api v0.30.1
k8s.io/apiextensions-apiserver v0.30.1
k8s.io/apimachinery v0.30.1
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -495,8 +495,8 @@ istio.io/api v1.22.0-alpha.1.0.20240620154034-5b788fec62d2 h1:In1BXbQHMWmNn+wypv
istio.io/api v1.22.0-alpha.1.0.20240620154034-5b788fec62d2/go.mod h1:THZA8sI/o2TXhmTM3P2EejCuE8VtWdMdrDQMD9FbdoU=
istio.io/client-go v1.22.0-alpha.1.0.20240620154436-0945d7438eb2 h1:FrKxKJfaInf0odeq9INw4D4OmNmVlBPL5gaiE1J5Z/o=
istio.io/client-go v1.22.0-alpha.1.0.20240620154436-0945d7438eb2/go.mod h1:OmCqmAHbNf4jkixGgDizSnTI5gpaJCVyKF7eWWuZq/A=
istio.io/istio v0.0.0-20240625173720-ddb336cc9e72 h1:ga80XoZk8T02Ih3ziNvfVFcGHDeaxvd7jOSlBHCSM/0=
istio.io/istio v0.0.0-20240625173720-ddb336cc9e72/go.mod h1:iTBH6dELuLuLhn+GBM3eWP98RiMTftnHO6Eg0/W+rkM=
istio.io/istio v0.0.0-20240626221714-1c5963301ae4 h1:MToJF7J6GMgPpYbWBKI5Ex7WYLgryh8u+eAy62e0Ajo=
istio.io/istio v0.0.0-20240626221714-1c5963301ae4/go.mod h1:iTBH6dELuLuLhn+GBM3eWP98RiMTftnHO6Eg0/W+rkM=
k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY=
k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM=
k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws=
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.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
appVersion: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559
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.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
version: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559
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.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
appVersion: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559
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.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
version: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559
2 changes: 1 addition & 1 deletion resources/latest/charts/cni/values.yaml
Original file line number Diff line number Diff line change
@@ -112,7 +112,7 @@ defaults:
hub: gcr.io/istio-testing

# Default tag for Istio images.
tag: 1.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
tag: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559

# Variant of the image to use.
# Currently supported are: [debug, distroless]
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.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
appVersion: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559
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.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
version: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559
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.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
appVersion: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559
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.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
version: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559
2 changes: 1 addition & 1 deletion resources/latest/charts/istiod/values.yaml
Original file line number Diff line number Diff line change
@@ -242,7 +242,7 @@ defaults:
# Dev builds from prow are on gcr.io
hub: gcr.io/istio-testing
# Default tag for Istio images.
tag: 1.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
tag: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559
# Variant of the image to use.
# Currently supported are: [debug, distroless]
variant: ""
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.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
appVersion: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559
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.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
version: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559
2 changes: 0 additions & 2 deletions resources/latest/charts/ztunnel/templates/daemonset.yaml
Original file line number Diff line number Diff line change
@@ -107,8 +107,6 @@ spec:
value: {{ .Values.multiCluster.clusterName | default "Kubernetes" }}
- name: INPOD_ENABLED
value: "true"
- name: ISTIO_META_DNS_PROXY_ADDR
value: "127.0.0.1:15053"
- name: POD_NAME
valueFrom:
fieldRef:
2 changes: 1 addition & 1 deletion resources/latest/charts/ztunnel/values.yaml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ defaults:
# 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.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9
tag: 1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559
# Variant to pull. Options are "debug" or "distroless". Unset will use the default for the given version.
variant: ""

12 changes: 6 additions & 6 deletions versions.yaml
Original file line number Diff line number Diff line change
@@ -64,10 +64,10 @@ versions:
version: 1.23-alpha
repo: https://github.com/istio/istio
branch: master
commit: ddb336cc9e728e672e328cfe6bc2e223af1cecf9
commit: 1c5963301ae491bdb7a76d9480fcc0610c045559
charts:
- https://storage.googleapis.com/istio-build/dev/1.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9/helm/base-1.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9.tgz
- https://storage.googleapis.com/istio-build/dev/1.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9/helm/cni-1.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9.tgz
- https://storage.googleapis.com/istio-build/dev/1.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9/helm/gateway-1.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9.tgz
- https://storage.googleapis.com/istio-build/dev/1.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9/helm/istiod-1.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9.tgz
- https://storage.googleapis.com/istio-build/dev/1.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9/helm/ztunnel-1.23-alpha.ddb336cc9e728e672e328cfe6bc2e223af1cecf9.tgz
- https://storage.googleapis.com/istio-build/dev/1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559/helm/base-1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559.tgz
- https://storage.googleapis.com/istio-build/dev/1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559/helm/cni-1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559.tgz
- https://storage.googleapis.com/istio-build/dev/1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559/helm/gateway-1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559.tgz
- https://storage.googleapis.com/istio-build/dev/1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559/helm/istiod-1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559.tgz
- https://storage.googleapis.com/istio-build/dev/1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559/helm/ztunnel-1.23-alpha.1c5963301ae491bdb7a76d9480fcc0610c045559.tgz