[OPERATOR-784] Downgrade envoy image version to v1.21.4

libopenstorage · Jun 17, 2022 · 8d3ac84 · 8d3ac84
1 parent 02a613c
commit 8d3ac84
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/drivers/storage/portworx/manifest/manifest.go b/drivers/storage/portworx/manifest/manifest.go
@@ -30,7 +30,7 @@ const (
 	defaultLighthouseImage     = "portworx/px-lighthouse:2.0.7"
 	defaultNodeWiperImage      = "portworx/px-node-wiper:2.5.0"
 	defaultTelemetryImage      = "purestorage/ccm-service:3.2.10"
-	defaultCollectorProxyImage = "envoyproxy/envoy:v1.22.2"
+	defaultCollectorProxyImage = "envoyproxy/envoy:v1.21.4"
 	defaultCollectorImage      = "purestorage/realtime-metrics:1.0.1"
 
 	// DefaultPrometheusOperatorImage is the default Prometheus operator image for k8s 1.21 and below

diff --git a/drivers/storage/portworx/manifest/manifest_test.go b/drivers/storage/portworx/manifest/manifest_test.go
@@ -38,7 +38,7 @@ func TestManifestWithNewerPortworxVersion(t *testing.T) {
 			AlertManager:              "image/alertmanager:2.6.0",
 			Telemetry:                 "image/ccm-service:3.2.10",
 			MetricsCollector:          "purestorage/realtime-metrics:1.0.1",
-			MetricsCollectorProxy:     "envoyproxy/envoy:v1.22.2",
+			MetricsCollectorProxy:     "envoyproxy/envoy:v1.21.4",
 		},
 	}
 	httpGet = func(url string) (*http.Response, error) {
@@ -75,7 +75,7 @@ func TestManifestWithNewerPortworxVersionAndConfigMapPresent(t *testing.T) {
 			AlertManager:              "image/alertmanager:2.6.0",
 			Telemetry:                 "image/ccm-service:3.2.10",
 			MetricsCollector:          "purestorage/realtime-metrics:1.0.1",
-			MetricsCollectorProxy:     "envoyproxy/envoy:v1.22.2",
+			MetricsCollectorProxy:     "envoyproxy/envoy:v1.21.4",
 		},
 	}
 
@@ -163,7 +163,7 @@ func TestManifestWithOlderPortworxVersion(t *testing.T) {
 			AlertManager:              "image/alertmanager:2.6.0",
 			Telemetry:                 "image/ccm-service:3.2.10",
 			MetricsCollector:          "purestorage/realtime-metrics:1.0.1",
-			MetricsCollectorProxy:     "envoyproxy/envoy:v1.22.2",
+			MetricsCollectorProxy:     "envoyproxy/envoy:v1.21.4",
 		},
 	}
 	httpGet = func(url string) (*http.Response, error) {
@@ -250,7 +250,7 @@ func TestManifestWithKnownNonSemvarPortworxVersion(t *testing.T) {
 			AlertManager:              "image/alertmanager:2.6.0",
 			Telemetry:                 "image/ccm-service:3.2.10",
 			MetricsCollector:          "purestorage/realtime-metrics:1.0.1",
-			MetricsCollectorProxy:     "envoyproxy/envoy:v1.22.2",
+			MetricsCollectorProxy:     "envoyproxy/envoy:v1.21.4",
 		},
 	}
 	httpGet = func(url string) (*http.Response, error) {
@@ -329,7 +329,7 @@ func TestManifestWithoutPortworxVersion(t *testing.T) {
 			AlertManager:              "image/alertmanager:2.6.0",
 			Telemetry:                 "image/ccm-service:3.2.10",
 			MetricsCollector:          "purestorage/realtime-metrics:1.0.1",
-			MetricsCollectorProxy:     "envoyproxy/envoy:v1.22.2",
+			MetricsCollectorProxy:     "envoyproxy/envoy:v1.21.4",
 		},
 	}
 	cluster := &corev1.StorageCluster{