From da9ad1363834f555e373f814afbd65cf11d4ce00 Mon Sep 17 00:00:00 2001 From: Joanna Ko Date: Wed, 9 Oct 2024 14:34:28 -0700 Subject: [PATCH] Revert "Bump wavefronthq/proxy from 13.4 to 13.7 (#579)" This reverts commit e037e63da39836fa20b2011c9e92d07453969a5b. --- .github/docker-dependabot/dummy-deployment.yaml | 2 +- .../hack/deploy/examples/6-wavefront-proxy-with-http-proxy.yaml | 2 +- collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml | 2 +- collector/hack/test/base/proxy.template.yaml | 2 +- deploy/wavefront-operator.yaml | 2 +- docs/operator/custom-configuration.md | 2 +- operator/config/manager/component_versions.yaml | 2 +- operator/dev-internal/deploy/wavefront-operator.yaml | 2 +- operator/dev-internal/docs/operator/custom-configuration.md | 2 +- operator/hack/migration/wavefront-proxy.yaml | 2 +- .../test/deploy/scenarios/wavefront-allow-legacy-install.yaml | 2 +- .../hack/test/deploy/scenarios/wavefront-validation-legacy.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/docker-dependabot/dummy-deployment.yaml b/.github/docker-dependabot/dummy-deployment.yaml index 7a3974d66..b32b37b86 100644 --- a/.github/docker-dependabot/dummy-deployment.yaml +++ b/.github/docker-dependabot/dummy-deployment.yaml @@ -20,7 +20,7 @@ spec: # 2. Manually update the version in operator/config/manager/component_versions.yaml # 3. Copy the proxy image to Harbor, see "Copying the proxy image to Harbor" in our Technical References confluence page for details - name: wf-proxy - image: wavefronthq/proxy:13.7 + image: projects.registry.vmware.com/tanzu_observability/proxy:13.4 # Fluent Bit Updates: # 1. Copy fluent-bit image to Harbor, see "Copying Latest fluentbit image to Harbor" in our Technical References confluence page for details # 2. Manually search/replace for references of `kubernetes-operator-fluentbit:` and substitute . diff --git a/collector/hack/deploy/examples/6-wavefront-proxy-with-http-proxy.yaml b/collector/hack/deploy/examples/6-wavefront-proxy-with-http-proxy.yaml index f27accd51..748c3b386 100644 --- a/collector/hack/deploy/examples/6-wavefront-proxy-with-http-proxy.yaml +++ b/collector/hack/deploy/examples/6-wavefront-proxy-with-http-proxy.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: wavefront-proxy - image: wavefronthq/proxy:13.7 + image: projects.registry.vmware.com/tanzu_observability/proxy:13.4 imagePullPolicy: IfNotPresent env: - name: WAVEFRONT_URL diff --git a/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml b/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml index 1bd2dca31..aff931b79 100644 --- a/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml +++ b/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml @@ -23,7 +23,7 @@ spec: value: arm64 containers: - name: wavefront-proxy - image: wavefronthq/proxy:13.7 + image: projects.registry.vmware.com/tanzu_observability/proxy:13.4 imagePullPolicy: IfNotPresent env: - name: WAVEFRONT_URL diff --git a/collector/hack/test/base/proxy.template.yaml b/collector/hack/test/base/proxy.template.yaml index 0acf2ba72..3b4a56c88 100644 --- a/collector/hack/test/base/proxy.template.yaml +++ b/collector/hack/test/base/proxy.template.yaml @@ -22,7 +22,7 @@ spec: value: arm64 containers: - name: wavefront-proxy - image: wavefronthq/proxy:13.7 + image: projects.registry.vmware.com/tanzu_observability/proxy:13.4 imagePullPolicy: Always env: - name: WAVEFRONT_URL diff --git a/deploy/wavefront-operator.yaml b/deploy/wavefront-operator.yaml index 4bb8d1765..968731726 100644 --- a/deploy/wavefront-operator.yaml +++ b/deploy/wavefront-operator.yaml @@ -1452,7 +1452,7 @@ apiVersion: v1 data: collector: 1.29.2 logging: 2.2.0 - proxy: "13.7" + proxy: "13.4" kind: ConfigMap metadata: labels: diff --git a/docs/operator/custom-configuration.md b/docs/operator/custom-configuration.md index b77010cbf..b3e06cadb 100644 --- a/docs/operator/custom-configuration.md +++ b/docs/operator/custom-configuration.md @@ -11,7 +11,7 @@ Install the Observability for Kubernetes Operator into `observability-system` na |---|---|---| | Observability for Kubernetes Operator | `projects.registry.vmware.com/tanzu_observability/kubernetes-operator:2.17.2` | `YOUR_IMAGE_REGISTRY/kubernetes-operator:2.17.2` | | Kubernetes Metrics Collector | `projects.registry.vmware.com/tanzu_observability/kubernetes-collector:1.29.2` | `YOUR_IMAGE_REGISTRY/kubernetes-collector:1.29.2` | -| Wavefront Proxy | `wavefronthq/proxy:13.7` | `YOUR_IMAGE_REGISTRY/proxy:13.7` | +| Wavefront Proxy | `projects.registry.vmware.com/tanzu_observability/proxy:13.4` | `YOUR_IMAGE_REGISTRY/proxy:13.4` | | Operations for Applications logging | `projects.registry.vmware.com/tanzu_observability/kubernetes-operator-fluentbit:2.2.0` | `YOUR_IMAGE_REGISTRY/kubernetes-operator-fluentbit:2.2.0` | 2. Create a local directory called `observability`. diff --git a/operator/config/manager/component_versions.yaml b/operator/config/manager/component_versions.yaml index 02cc75087..cb7d6bac5 100644 --- a/operator/config/manager/component_versions.yaml +++ b/operator/config/manager/component_versions.yaml @@ -9,4 +9,4 @@ metadata: data: collector: "1.29.2" logging: "2.2.0" - proxy: "13.7" + proxy: "13.4" diff --git a/operator/dev-internal/deploy/wavefront-operator.yaml b/operator/dev-internal/deploy/wavefront-operator.yaml index 4bb8d1765..968731726 100644 --- a/operator/dev-internal/deploy/wavefront-operator.yaml +++ b/operator/dev-internal/deploy/wavefront-operator.yaml @@ -1452,7 +1452,7 @@ apiVersion: v1 data: collector: 1.29.2 logging: 2.2.0 - proxy: "13.7" + proxy: "13.4" kind: ConfigMap metadata: labels: diff --git a/operator/dev-internal/docs/operator/custom-configuration.md b/operator/dev-internal/docs/operator/custom-configuration.md index b77010cbf..b3e06cadb 100644 --- a/operator/dev-internal/docs/operator/custom-configuration.md +++ b/operator/dev-internal/docs/operator/custom-configuration.md @@ -11,7 +11,7 @@ Install the Observability for Kubernetes Operator into `observability-system` na |---|---|---| | Observability for Kubernetes Operator | `projects.registry.vmware.com/tanzu_observability/kubernetes-operator:2.17.2` | `YOUR_IMAGE_REGISTRY/kubernetes-operator:2.17.2` | | Kubernetes Metrics Collector | `projects.registry.vmware.com/tanzu_observability/kubernetes-collector:1.29.2` | `YOUR_IMAGE_REGISTRY/kubernetes-collector:1.29.2` | -| Wavefront Proxy | `wavefronthq/proxy:13.7` | `YOUR_IMAGE_REGISTRY/proxy:13.7` | +| Wavefront Proxy | `projects.registry.vmware.com/tanzu_observability/proxy:13.4` | `YOUR_IMAGE_REGISTRY/proxy:13.4` | | Operations for Applications logging | `projects.registry.vmware.com/tanzu_observability/kubernetes-operator-fluentbit:2.2.0` | `YOUR_IMAGE_REGISTRY/kubernetes-operator-fluentbit:2.2.0` | 2. Create a local directory called `observability`. diff --git a/operator/hack/migration/wavefront-proxy.yaml b/operator/hack/migration/wavefront-proxy.yaml index 2e7cca693..641afad06 100644 --- a/operator/hack/migration/wavefront-proxy.yaml +++ b/operator/hack/migration/wavefront-proxy.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: wavefront-proxy - image: wavefronthq/proxy:13.7 + image: projects.registry.vmware.com/tanzu_observability/proxy:13.4 imagePullPolicy: IfNotPresent env: - name: WAVEFRONT_URL diff --git a/operator/hack/test/deploy/scenarios/wavefront-allow-legacy-install.yaml b/operator/hack/test/deploy/scenarios/wavefront-allow-legacy-install.yaml index 33f03fbdb..14425284b 100644 --- a/operator/hack/test/deploy/scenarios/wavefront-allow-legacy-install.yaml +++ b/operator/hack/test/deploy/scenarios/wavefront-allow-legacy-install.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: wavefront-proxy - image: wavefronthq/proxy:13.7 + image: projects.registry.vmware.com/tanzu_observability/proxy:13.4 imagePullPolicy: IfNotPresent env: - name: WAVEFRONT_URL diff --git a/operator/hack/test/deploy/scenarios/wavefront-validation-legacy.yaml b/operator/hack/test/deploy/scenarios/wavefront-validation-legacy.yaml index ff7d5f620..fca19dc8a 100644 --- a/operator/hack/test/deploy/scenarios/wavefront-validation-legacy.yaml +++ b/operator/hack/test/deploy/scenarios/wavefront-validation-legacy.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: wavefront-proxy - image: wavefronthq/proxy:13.7 + image: projects.registry.vmware.com/tanzu_observability/proxy:13.4 imagePullPolicy: IfNotPresent env: - name: WAVEFRONT_URL