Update cruise control image to use the branch 2.4.x

banzaicloud · Jun 2, 2020 · dfc2352 · dfc2352
1 parent 6f7c585
commit dfc2352
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 1 deletion.
diff --git a/config/samples/banzaicloud_v1beta1_kafkacluster.yaml b/config/samples/banzaicloud_v1beta1_kafkacluster.yaml
@@ -270,6 +270,7 @@ spec:
       metric.sampler.partition.assignor.class=com.linkedin.kafka.cruisecontrol.monitor.sampling.DefaultMetricSamplerPartitionAssignor
       # The metric sampling interval in milliseconds
       metric.sampling.interval.ms=120000
+      metric.anomaly.detection.interval.ms=180000
       # The partition metrics window size in milliseconds
       partition.metrics.window.ms=300000
       # The number of partition metric windows to keep in memory

diff --git a/config/samples/kafkacluster-with-istio.yaml b/config/samples/kafkacluster-with-istio.yaml
@@ -97,6 +97,7 @@ spec:
       metric.sampler.partition.assignor.class=com.linkedin.kafka.cruisecontrol.monitor.sampling.DefaultMetricSamplerPartitionAssignor
       # The metric sampling interval in milliseconds
       metric.sampling.interval.ms=120000
+      metric.anomaly.detection.interval.ms=180000
       # The partition metrics window size in milliseconds
       partition.metrics.window.ms=300000
       # The number of partition metric windows to keep in memory

diff --git a/config/samples/kafkacluster_with_external_ssl.yaml b/config/samples/kafkacluster_with_external_ssl.yaml
@@ -108,6 +108,7 @@ spec:
       metric.sampler.partition.assignor.class=com.linkedin.kafka.cruisecontrol.monitor.sampling.DefaultMetricSamplerPartitionAssignor
       # The metric sampling interval in milliseconds
       metric.sampling.interval.ms=120000
+      metric.anomaly.detection.interval.ms=180000
       # The partition metrics window size in milliseconds
       partition.metrics.window.ms=300000
       # The number of partition metric windows to keep in memory

diff --git a/config/samples/kafkacluster_with_internal_ssl_vault.yaml b/config/samples/kafkacluster_with_internal_ssl_vault.yaml
@@ -93,6 +93,7 @@ spec:
       metric.sampler.partition.assignor.class=com.linkedin.kafka.cruisecontrol.monitor.sampling.DefaultMetricSamplerPartitionAssignor
       # The metric sampling interval in milliseconds
       metric.sampling.interval.ms=120000
+      metric.anomaly.detection.interval.ms=180000
       # The partition metrics window size in milliseconds
       partition.metrics.window.ms=300000
       # The number of partition metric windows to keep in memory

diff --git a/config/samples/kafkacluster_with_ssl_groups.yaml b/config/samples/kafkacluster_with_ssl_groups.yaml
@@ -96,6 +96,7 @@ spec:
       metric.sampler.partition.assignor.class=com.linkedin.kafka.cruisecontrol.monitor.sampling.DefaultMetricSamplerPartitionAssignor
       # The metric sampling interval in milliseconds
       metric.sampling.interval.ms=120000
+      metric.anomaly.detection.interval.ms=180000
       # The partition metrics window size in milliseconds
       partition.metrics.window.ms=300000
       # The number of partition metric windows to keep in memory

diff --git a/config/samples/kafkacluster_without_ssl.yaml b/config/samples/kafkacluster_without_ssl.yaml
@@ -104,6 +104,7 @@ spec:
       metric.sampler.partition.assignor.class=com.linkedin.kafka.cruisecontrol.monitor.sampling.DefaultMetricSamplerPartitionAssignor
       # The metric sampling interval in milliseconds
       metric.sampling.interval.ms=120000
+      metric.anomaly.detection.interval.ms=180000
       # The partition metrics window size in milliseconds
       partition.metrics.window.ms=300000
       # The number of partition metric windows to keep in memory

diff --git a/config/samples/kafkacluster_without_ssl_groups.yaml b/config/samples/kafkacluster_without_ssl_groups.yaml
@@ -90,6 +90,7 @@ spec:
       metric.sampler.partition.assignor.class=com.linkedin.kafka.cruisecontrol.monitor.sampling.DefaultMetricSamplerPartitionAssignor
       # The metric sampling interval in milliseconds
       metric.sampling.interval.ms=120000
+      metric.anomaly.detection.interval.ms=180000
       # The partition metrics window size in milliseconds
       partition.metrics.window.ms=300000
       # The number of partition metric windows to keep in memory

diff --git a/config/samples/simplekafkacluster.yaml b/config/samples/simplekafkacluster.yaml
@@ -91,6 +91,7 @@ spec:
       metric.sampler.partition.assignor.class=com.linkedin.kafka.cruisecontrol.monitor.sampling.DefaultMetricSamplerPartitionAssignor
       # The metric sampling interval in milliseconds
       metric.sampling.interval.ms=120000
+      metric.anomaly.detection.interval.ms=180000
       # The partition metrics window size in milliseconds
       partition.metrics.window.ms=300000
       # The number of partition metric windows to keep in memory

diff --git a/config/samples/simplekafkacluster_ebs_csi.yaml b/config/samples/simplekafkacluster_ebs_csi.yaml
@@ -97,6 +97,7 @@ spec:
       metric.sampler.partition.assignor.class=com.linkedin.kafka.cruisecontrol.monitor.sampling.DefaultMetricSamplerPartitionAssignor
       # The metric sampling interval in milliseconds
       metric.sampling.interval.ms=120000
+      metric.anomaly.detection.interval.ms=180000
       # The partition metrics window size in milliseconds
       partition.metrics.window.ms=300000
       # The number of partition metric windows to keep in memory

diff --git a/pkg/sdk/v1beta1/kafkacluster_types.go b/pkg/sdk/v1beta1/kafkacluster_types.go
@@ -543,7 +543,7 @@ func (cConfig *CruiseControlConfig) GetCCImage() string {
 	if cConfig.Image != "" {
 		return cConfig.Image
 	}
-	return "solsson/kafka-cruise-control@sha256:658c21295a940b4c490aadfb95973b34f27fd9c944c3f11a2a9b89e5948a78bd"
+	return "banzaicloud/cruise-control:2.4.2"
 }
 
 // GetImage returns the used image for Prometheus JMX exporter