Skip to content

Commit

Permalink
[maistra-3.0] Automator: Update dependencies (#1735)
Browse files Browse the repository at this point in the history
Co-authored-by: maistra-bot <null>
  • Loading branch information
maistra-bot authored Mar 26, 2024
1 parent f2c271e commit c9bf527
Show file tree
Hide file tree
Showing 25 changed files with 75 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "istio build-tools",
"image": "gcr.io/istio-testing/build-tools:master-061780fd3181da88f895dcfe350a34daa4aa1076",
"image": "gcr.io/istio-testing/build-tools:master-30750b44971f0d66b92a8bcd681096a5f5e487f1",
"privileged": true,
"remoteEnv": {
"USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
Expand Down
4 changes: 2 additions & 2 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/maistra-dev/sail-operator:3.0-latest
createdAt: "2024-03-25T14:58:08Z"
createdAt: "2024-03-26T03:06:04Z"
description: Experimental operator for installing Istio service mesh
features.operators.openshift.io/cnf: "false"
features.operators.openshift.io/cni: "true"
Expand Down Expand Up @@ -289,7 +289,7 @@ spec:
- v1.21.0
- v1.20.3
- latest (837e1649)
- latest (2f54c6a5)
[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
Expand Down
2 changes: 1 addition & 1 deletion chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ csv:
- v1.21.0
- v1.20.3
- latest (837e1649)
- latest (2f54c6a5)
[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
Expand Down
2 changes: 1 addition & 1 deletion common/.commonfiles.sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
559e9789af605e7d5614d85bc18d88301e264efb
f611946af7623d2ce03e2d4e146d0f238b5f0ca4
2 changes: 1 addition & 1 deletion common/scripts/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ fi
TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
PROJECT_ID=${PROJECT_ID:-istio-testing}
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
IMAGE_VERSION=master-061780fd3181da88f895dcfe350a34daa4aa1076
IMAGE_VERSION=master-30750b44971f0d66b92a8bcd681096a5f5e487f1
fi
if [[ "${IMAGE_NAME:-}" == "" ]]; then
IMAGE_NAME=build-tools
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: v1
appVersion: 1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
appVersion: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45
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.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
version: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
pilot:
env:
# 1.21 behavioral changes
ENABLE_EXTERNAL_NAME_ALIAS: "false"
PERSIST_OLDEST_FIRST_HEURISTIC_FOR_VIRTUAL_SERVICE_HOST_MATCHING: "true"
VERIFY_CERTIFICATE_AT_CLIENT: "false"
ENABLE_AUTO_SNI: "false"

# 1.22 behavioral changes
ENABLE_RESOLUTION_NONE_TARGET_PORT: "false"

meshConfig:
defaultConfig:
tracing:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
pilot:
env:
# 1.22 behavioral changes
ENABLE_RESOLUTION_NONE_TARGET_PORT: "false"
meshConfig:
defaultConfig:
tracing:
Expand Down
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: v1
appVersion: 1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
appVersion: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45
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/tree/master/cni
version: 1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
version: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
pilot:
env:
# 1.21 behavioral changes
ENABLE_EXTERNAL_NAME_ALIAS: "false"
PERSIST_OLDEST_FIRST_HEURISTIC_FOR_VIRTUAL_SERVICE_HOST_MATCHING: "true"
VERIFY_CERTIFICATE_AT_CLIENT: "false"
ENABLE_AUTO_SNI: "false"

# 1.22 behavioral changes
ENABLE_RESOLUTION_NONE_TARGET_PORT: "false"

meshConfig:
defaultConfig:
tracing:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
pilot:
env:
# 1.22 behavioral changes
ENABLE_RESOLUTION_NONE_TARGET_PORT: "false"
meshConfig:
defaultConfig:
tracing:
Expand Down
2 changes: 1 addition & 1 deletion resources/latest/charts/cni/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ defaults:
hub: gcr.io/istio-testing

# Default tag for Istio images.
tag: 1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
tag: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45

# 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.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
appVersion: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45
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.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
version: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
pilot:
env:
# 1.21 behavioral changes
ENABLE_EXTERNAL_NAME_ALIAS: "false"
PERSIST_OLDEST_FIRST_HEURISTIC_FOR_VIRTUAL_SERVICE_HOST_MATCHING: "true"
VERIFY_CERTIFICATE_AT_CLIENT: "false"
ENABLE_AUTO_SNI: "false"

# 1.22 behavioral changes
ENABLE_RESOLUTION_NONE_TARGET_PORT: "false"

meshConfig:
defaultConfig:
tracing:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
pilot:
env:
# 1.22 behavioral changes
ENABLE_RESOLUTION_NONE_TARGET_PORT: "false"
meshConfig:
defaultConfig:
tracing:
Expand Down
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: v1
appVersion: 1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
appVersion: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45
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.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
version: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
pilot:
env:
# 1.21 behavioral changes
ENABLE_EXTERNAL_NAME_ALIAS: "false"
PERSIST_OLDEST_FIRST_HEURISTIC_FOR_VIRTUAL_SERVICE_HOST_MATCHING: "true"
VERIFY_CERTIFICATE_AT_CLIENT: "false"
ENABLE_AUTO_SNI: "false"

# 1.22 behavioral changes
ENABLE_RESOLUTION_NONE_TARGET_PORT: "false"

meshConfig:
defaultConfig:
tracing:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
pilot:
env:
# 1.22 behavioral changes
ENABLE_RESOLUTION_NONE_TARGET_PORT: "false"
meshConfig:
defaultConfig:
tracing:
Expand Down
2 changes: 1 addition & 1 deletion resources/latest/charts/istiod/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ defaults:
# Dev builds from prow are on gcr.io
hub: gcr.io/istio-testing
# Default tag for Istio images.
tag: 1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
tag: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45
# 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: v1
appVersion: 1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
appVersion: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45
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.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
version: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
pilot:
env:
# 1.21 behavioral changes
ENABLE_EXTERNAL_NAME_ALIAS: "false"
PERSIST_OLDEST_FIRST_HEURISTIC_FOR_VIRTUAL_SERVICE_HOST_MATCHING: "true"
VERIFY_CERTIFICATE_AT_CLIENT: "false"
ENABLE_AUTO_SNI: "false"

# 1.22 behavioral changes
ENABLE_RESOLUTION_NONE_TARGET_PORT: "false"

meshConfig:
defaultConfig:
tracing:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
pilot:
env:
# 1.22 behavioral changes
ENABLE_RESOLUTION_NONE_TARGET_PORT: "false"
meshConfig:
defaultConfig:
tracing:
Expand Down
5 changes: 5 additions & 0 deletions resources/latest/charts/ztunnel/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ spec:
name: istio-token
- mountPath: /var/run/ztunnel
name: cni-ztunnel-sock-dir
- mountPath: /tmp
name: tmp
{{- with .Values.volumeMounts }}
{{- toYaml . | nindent 8 }}
{{- end }}
Expand All @@ -155,6 +157,9 @@ spec:
hostPath:
path: /var/run/ztunnel
type: DirectoryOrCreate # ideally this would be a socket, but ztunnel may not have started yet.
# pprof needs a writable /tmp, and we don't have that thanks to `readOnlyRootFilesystem: true`, so mount one
- name: tmp
emptyDir: {}
{{- with .Values.volumes }}
{{- toYaml . | nindent 6}}
{{- end }}
2 changes: 1 addition & 1 deletion resources/latest/charts/ztunnel/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7
tag: 1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45
# Variant to pull. Options are "debug" or "distroless". Unset will use the default for the given version.
variant: ""

Expand Down
12 changes: 6 additions & 6 deletions versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ versions:
version: 1.22-alpha
repo: https://github.com/istio/istio
branch: master
commit: 837e164959ae88148e5294454138e6a8e9ab0dc7
commit: 2f54c6a52a5c6661d5eb9bd2277aab77304fee45
charts:
- https://storage.googleapis.com/istio-build/dev/1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7/helm/base-1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7.tgz
- https://storage.googleapis.com/istio-build/dev/1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7/helm/cni-1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7.tgz
- https://storage.googleapis.com/istio-build/dev/1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7/helm/gateway-1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7.tgz
- https://storage.googleapis.com/istio-build/dev/1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7/helm/istiod-1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7.tgz
- https://storage.googleapis.com/istio-build/dev/1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7/helm/ztunnel-1.22-alpha.837e164959ae88148e5294454138e6a8e9ab0dc7.tgz
- https://storage.googleapis.com/istio-build/dev/1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45/helm/base-1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45.tgz
- https://storage.googleapis.com/istio-build/dev/1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45/helm/cni-1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45.tgz
- https://storage.googleapis.com/istio-build/dev/1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45/helm/gateway-1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45.tgz
- https://storage.googleapis.com/istio-build/dev/1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45/helm/istiod-1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45.tgz
- https://storage.googleapis.com/istio-build/dev/1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45/helm/ztunnel-1.22-alpha.2f54c6a52a5c6661d5eb9bd2277aab77304fee45.tgz

0 comments on commit c9bf527

Please sign in to comment.