From 8380090d7863f996cdcfd166a92c91c6a168a474 Mon Sep 17 00:00:00 2001 From: Kyle Liberti Date: Tue, 19 Jan 2021 08:39:49 -0500 Subject: [PATCH 1/8] Remove upstream jmxtrans examples Signed-off-by: Kyle Liberti --- examples/metrics/jmxtrans/jmxtrans.yaml | 45 ------------------------- 1 file changed, 45 deletions(-) delete mode 100644 examples/metrics/jmxtrans/jmxtrans.yaml diff --git a/examples/metrics/jmxtrans/jmxtrans.yaml b/examples/metrics/jmxtrans/jmxtrans.yaml deleted file mode 100644 index ca1fb1b6..00000000 --- a/examples/metrics/jmxtrans/jmxtrans.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: kafka.strimzi.io/v1beta1 -kind: Kafka -metadata: - name: my-cluster -spec: - kafka: - version: 2.6.0 - replicas: 2 - listeners: - - name: plain - port: 9092 - type: internal - tls: false - - name: tls - port: 9093 - type: internal - tls: true - config: - offsets.topic.replication.factor: 1 - transaction.state.log.replication.factor: 1 - transaction.state.log.min.isr: 1 - log.message.format.version: "2.6" - inter.broker.protocol.version: "2.6" - storage: - type: ephemeral - jmxOptions: - authentication: - type: "password" - jmxTrans: - outputDefinitions: - - outputType: "com.googlecode.jmxtrans.model.output.StdOutWriter" - name: "standardOut" - - outputType: "com.googlecode.jmxtrans.model.output.GraphiteOutputWriter" - host: "mylogstash.com" - port: 31028 - flushDelayInSeconds: 5 - name: "logstash" - kafkaQueries: - - targetMBean: "kafka.server:type=BrokerTopicMetrics,name=*" - attributes: ["Count"] - outputs: ["standardOut"] - zookeeper: - replicas: 1 - storage: - type: ephemeral From 4848cb7465900971a939205a8c947781be37a603 Mon Sep 17 00:00:00 2001 From: amq-streams-bot <76227891+amq-streams-bot@users.noreply.github.com> Date: Thu, 4 Mar 2021 00:07:38 +0000 Subject: [PATCH 2/8] [CPaaS] Update CSVs for AMQ Streams Bundle 1.6.3 --- operator-metadata/image.yaml | 2 +- ...streams.v1.6.3.clusterserviceversion.yaml} | 40 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) rename operator-metadata/manifests/{amq-streams.v1.6.2.clusterserviceversion.yaml => amq-streams.v1.6.3.clusterserviceversion.yaml} (97%) diff --git a/operator-metadata/image.yaml b/operator-metadata/image.yaml index bc8ac72c..1933a011 100644 --- a/operator-metadata/image.yaml +++ b/operator-metadata/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-rhel7-operator-metadata description: "AMQ Streams image containing the operator metadata" -version: "1.6.2" +version: "1.6.3" from: scratch labels: diff --git a/operator-metadata/manifests/amq-streams.v1.6.2.clusterserviceversion.yaml b/operator-metadata/manifests/amq-streams.v1.6.3.clusterserviceversion.yaml similarity index 97% rename from operator-metadata/manifests/amq-streams.v1.6.2.clusterserviceversion.yaml rename to operator-metadata/manifests/amq-streams.v1.6.3.clusterserviceversion.yaml index e1ad5c9b..198cbc08 100644 --- a/operator-metadata/manifests/amq-streams.v1.6.2.clusterserviceversion.yaml +++ b/operator-metadata/manifests/amq-streams.v1.6.3.clusterserviceversion.yaml @@ -1,7 +1,7 @@ apiVersion: operators.coreos.com/v1alpha1 kind: ClusterServiceVersion metadata: - name: amqstreams.v1.6.2 + name: amqstreams.v1.6.3 namespace: placeholder annotations: alm-examples-metadata: |- @@ -455,8 +455,8 @@ spec: Documentation for the current release can be found on Red Hat [website](https://access.redhat.com/documentation/en-us/red_hat_amq/2020.q4/html-single/using_amq_streams_on_openshift/index). keywords: ['amq', 'amq-streams', 'kafka', 'messaging', 'kafka-connect', 'kafka-streams', 'data-streaming', 'data-streams', 'streaming', 'streams'] - version: 1.6.2 - replaces: amqstreams.v1.6.1 + version: 1.6.3 + replaces: amqstreams.v1.6.2 minKubeVersion: 1.11.0 maturity: stable maintainers: @@ -490,9 +490,9 @@ spec: - name: strimzi-cluster-operator image: registry.redhat.io/amq7/amq-streams-rhel7-operator@sha256:f4910a541d366a648194dc244a3e9cda7233cb56f9a69c5c9b2015f872f97fd1 - name: strimzi-kafka-25 - image: registry.redhat.io/amq7/amq-streams-kafka-25-rhel7@sha256:e554573ca71ad236cee95c70a0b1a0abb85f80b7efb97afcb53919b18404c98c + image: registry.redhat.io/amq7/amq-streams-kafka-25-rhel7@sha256:7fe71ea7d604974650641ec91bbcd4a9eb62efe0b8f0d81ce14027cfac0e07ab - name: strimzi-kafka-26 - image: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:48f1f0ca70f27bb8a24f574fd9916ad718e19d9b3505eb39df4226819b14a3d2 + image: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:01a98d4eba2c3a2178503b2a179a54afbc02543c1bb5964cb6845e28fdcdc4d2 - name: strimzi-bridge image: registry.redhat.io/amq7/amq-streams-bridge-rhel7@sha256:0ade1f025d061e231a4436a6f132df1f30a3a8da91acf3449f201cd8be480a10 install: @@ -774,7 +774,7 @@ spec: - get - list deployments: - - name: amq-streams-cluster-operator-v1.6.2 + - name: amq-streams-cluster-operator-v1.6.3 spec: replicas: 1 selector: @@ -811,33 +811,33 @@ spec: - name: STRIMZI_OPERATION_TIMEOUT_MS value: "300000" - name: STRIMZI_DEFAULT_TLS_SIDECAR_ENTITY_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:48f1f0ca70f27bb8a24f574fd9916ad718e19d9b3505eb39df4226819b14a3d2 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:01a98d4eba2c3a2178503b2a179a54afbc02543c1bb5964cb6845e28fdcdc4d2 - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:48f1f0ca70f27bb8a24f574fd9916ad718e19d9b3505eb39df4226819b14a3d2 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:01a98d4eba2c3a2178503b2a179a54afbc02543c1bb5964cb6845e28fdcdc4d2 - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:48f1f0ca70f27bb8a24f574fd9916ad718e19d9b3505eb39df4226819b14a3d2 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:01a98d4eba2c3a2178503b2a179a54afbc02543c1bb5964cb6845e28fdcdc4d2 - name: STRIMZI_DEFAULT_TLS_SIDECAR_CRUISE_CONTROL_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:48f1f0ca70f27bb8a24f574fd9916ad718e19d9b3505eb39df4226819b14a3d2 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:01a98d4eba2c3a2178503b2a179a54afbc02543c1bb5964cb6845e28fdcdc4d2 - name: STRIMZI_KAFKA_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7@sha256:e554573ca71ad236cee95c70a0b1a0abb85f80b7efb97afcb53919b18404c98c - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:48f1f0ca70f27bb8a24f574fd9916ad718e19d9b3505eb39df4226819b14a3d2 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7@sha256:7fe71ea7d604974650641ec91bbcd4a9eb62efe0b8f0d81ce14027cfac0e07ab + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:01a98d4eba2c3a2178503b2a179a54afbc02543c1bb5964cb6845e28fdcdc4d2 - name: STRIMZI_KAFKA_CONNECT_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7@sha256:e554573ca71ad236cee95c70a0b1a0abb85f80b7efb97afcb53919b18404c98c - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:48f1f0ca70f27bb8a24f574fd9916ad718e19d9b3505eb39df4226819b14a3d2 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7@sha256:7fe71ea7d604974650641ec91bbcd4a9eb62efe0b8f0d81ce14027cfac0e07ab + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:01a98d4eba2c3a2178503b2a179a54afbc02543c1bb5964cb6845e28fdcdc4d2 - name: STRIMZI_KAFKA_CONNECT_S2I_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7@sha256:e554573ca71ad236cee95c70a0b1a0abb85f80b7efb97afcb53919b18404c98c - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:48f1f0ca70f27bb8a24f574fd9916ad718e19d9b3505eb39df4226819b14a3d2 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7@sha256:7fe71ea7d604974650641ec91bbcd4a9eb62efe0b8f0d81ce14027cfac0e07ab + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:01a98d4eba2c3a2178503b2a179a54afbc02543c1bb5964cb6845e28fdcdc4d2 - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7@sha256:e554573ca71ad236cee95c70a0b1a0abb85f80b7efb97afcb53919b18404c98c - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:48f1f0ca70f27bb8a24f574fd9916ad718e19d9b3505eb39df4226819b14a3d2 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7@sha256:7fe71ea7d604974650641ec91bbcd4a9eb62efe0b8f0d81ce14027cfac0e07ab + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:01a98d4eba2c3a2178503b2a179a54afbc02543c1bb5964cb6845e28fdcdc4d2 - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7@sha256:e554573ca71ad236cee95c70a0b1a0abb85f80b7efb97afcb53919b18404c98c - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:48f1f0ca70f27bb8a24f574fd9916ad718e19d9b3505eb39df4226819b14a3d2 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7@sha256:7fe71ea7d604974650641ec91bbcd4a9eb62efe0b8f0d81ce14027cfac0e07ab + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7@sha256:01a98d4eba2c3a2178503b2a179a54afbc02543c1bb5964cb6845e28fdcdc4d2 - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE value: registry.redhat.io/amq7/amq-streams-rhel7-operator@sha256:f4910a541d366a648194dc244a3e9cda7233cb56f9a69c5c9b2015f872f97fd1 - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE From beecf46a51120eb6b45f42216695e7bfa1a1379f Mon Sep 17 00:00:00 2001 From: Kyle Liberti Date: Tue, 27 Apr 2021 12:12:48 -0400 Subject: [PATCH 3/8] Update MD5s for AMQ Streams 1.6.4 CR1 Signed-off-by: Kyle Liberti --- bridge/image.yaml | 2 +- bridge/modules/bridge/module.yaml | 2 +- ...0-Deployment-strimzi-cluster-operator.yaml | 38 +++++++++---------- .../05-Deployment-strimzi-topic-operator.yaml | 2 +- .../05-Deployment-strimzi-user-operator.yaml | 2 +- kafka/kafka-2.5.0/image.yaml | 2 +- kafka/kafka-2.6.0/image.yaml | 2 +- kafka/modules/kafka/2.5.0/module.yaml | 4 +- kafka/modules/kafka/2.6.0/module.yaml | 4 +- kafka/modules/kafka/base/module.yaml | 4 +- operator/image.yaml | 2 +- operator/modules/operator/module.yaml | 2 +- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/bridge/image.yaml b/bridge/image.yaml index d571e668..a4bb074a 100644 --- a/bridge/image.yaml +++ b/bridge/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-bridge-rhel7 description: "AMQ Streams image for running the Apache Kafka bridge" -version: "1.6.2" +version: "1.6.4" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/bridge/modules/bridge/module.yaml b/bridge/modules/bridge/module.yaml index d02900f3..03f66903 100644 --- a/bridge/modules/bridge/module.yaml +++ b/bridge/modules/bridge/module.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: bridge -version: 1.6.2 +version: 1.6.4 envs: - name: "STRIMZI_HOME" diff --git a/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml index b1edad19..6ddbb5e1 100644 --- a/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml +++ b/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml @@ -23,7 +23,7 @@ spec: name: strimzi-cluster-operator containers: - name: strimzi-cluster-operator - image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.2 + image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.4 ports: - containerPort: 8080 name: http @@ -42,41 +42,41 @@ spec: - name: STRIMZI_OPERATION_TIMEOUT_MS value: "300000" - name: STRIMZI_DEFAULT_TLS_SIDECAR_ENTITY_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.2 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.2 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.2 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 - name: STRIMZI_DEFAULT_TLS_SIDECAR_CRUISE_CONTROL_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.2 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 - name: STRIMZI_KAFKA_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.2 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.2 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.4 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 - name: STRIMZI_KAFKA_CONNECT_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.2 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.2 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.4 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 - name: STRIMZI_KAFKA_CONNECT_S2I_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.2 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.2 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.4 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.2 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.2 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.4 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.2 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.2 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.4 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.2 + value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.4 - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.2 + value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.4 - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE - value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.2 + value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.4 - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE - value: registry.redhat.io/amq7/amq-streams-bridge-rhel7:1.6.2 + value: registry.redhat.io/amq7/amq-streams-bridge-rhel7:1.6.4 livenessProbe: httpGet: path: /healthy diff --git a/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml b/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml index 2e679959..cf7c46d7 100644 --- a/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml +++ b/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: strimzi-topic-operator containers: - name: strimzi-topic-operator - image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.2 + image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.4 args: - /opt/strimzi/bin/topic_operator_run.sh env: diff --git a/install/user-operator/05-Deployment-strimzi-user-operator.yaml b/install/user-operator/05-Deployment-strimzi-user-operator.yaml index e666ab0e..9bc29dca 100644 --- a/install/user-operator/05-Deployment-strimzi-user-operator.yaml +++ b/install/user-operator/05-Deployment-strimzi-user-operator.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: strimzi-user-operator containers: - name: strimzi-user-operator - image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.2 + image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.4 args: - /opt/strimzi/bin/user_operator_run.sh env: diff --git a/kafka/kafka-2.5.0/image.yaml b/kafka/kafka-2.5.0/image.yaml index b131667b..375db081 100644 --- a/kafka/kafka-2.5.0/image.yaml +++ b/kafka/kafka-2.5.0/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-kafka-25-rhel7 description: "AMQ Streams image for running Apache Kafka, Zookeeper, Kafka Connect, Mirror Maker and Cruise Control" -version: "1.6.2" +version: "1.6.4" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/kafka/kafka-2.6.0/image.yaml b/kafka/kafka-2.6.0/image.yaml index 377074cf..95e54da5 100644 --- a/kafka/kafka-2.6.0/image.yaml +++ b/kafka/kafka-2.6.0/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-kafka-26-rhel7 description: "AMQ Streams image for running Apache Kafka, Zookeeper, Kafka Connect, Mirror Maker and Cruise Control" -version: "1.6.2" +version: "1.6.4" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/kafka/modules/kafka/2.5.0/module.yaml b/kafka/modules/kafka/2.5.0/module.yaml index 5456686f..cfe43449 100644 --- a/kafka/modules/kafka/2.5.0/module.yaml +++ b/kafka/modules/kafka/2.5.0/module.yaml @@ -8,13 +8,13 @@ envs: value: "amqstreams-kafka-25-container" artifacts: - - md5: f0e09ac0cedebdbf13e5ffaf5c235278 + - md5: 1bc26a4790e1a2f520cba04cdfea678d name: streams-ocp-25.zip modules: install: - name: kafka.base - version: 1.6.2 + version: 1.6.4 execute: - script: install.sh diff --git a/kafka/modules/kafka/2.6.0/module.yaml b/kafka/modules/kafka/2.6.0/module.yaml index e40aaba0..e30eba2b 100644 --- a/kafka/modules/kafka/2.6.0/module.yaml +++ b/kafka/modules/kafka/2.6.0/module.yaml @@ -8,13 +8,13 @@ envs: value: "amqstreams-kafka-26-container" artifacts: - - md5: d5bbbac769d575d3df800b0b913a01e2 + - md5: 85cee2b31ac41675e954bb12f240377c name: streams-ocp-26.zip modules: install: - name: kafka.base - version: 1.6.2 + version: 1.6.4 execute: - script: install.sh diff --git a/kafka/modules/kafka/base/module.yaml b/kafka/modules/kafka/base/module.yaml index e1ecbd1b..afd22feb 100644 --- a/kafka/modules/kafka/base/module.yaml +++ b/kafka/modules/kafka/base/module.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: kafka.base -version: 1.6.2 +version: 1.6.4 envs: - name: "KAFKA_HOME" @@ -18,7 +18,7 @@ envs: artifacts: - md5: c5c48c3879094a42c271fbf561193b6e name: strimzi-kafka-scripts.zip - - md5: 58a16a93070fb1fd91f2946a5d8f6cac + - md5: 946d7ae019f52e33fff6d8e6c31284ac name: cruise-control-ocp.zip packages: diff --git a/operator/image.yaml b/operator/image.yaml index 3f86237c..47b71740 100644 --- a/operator/image.yaml +++ b/operator/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-rhel7-operator description: "AMQ Streams image for the Cluster, Topic, User Operators, and Kafka init" -version: "1.6.2" +version: "1.6.4" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/operator/modules/operator/module.yaml b/operator/modules/operator/module.yaml index 1231c421..fd54c56c 100644 --- a/operator/modules/operator/module.yaml +++ b/operator/modules/operator/module.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: operator -version: 1.6.2 +version: 1.6.4 envs: - name: "STRIMZI_HOME" From 366dcd5a3be375f38314eb435ed84a36df0d9162 Mon Sep 17 00:00:00 2001 From: Paolo Patierno Date: Fri, 10 Dec 2021 17:20:00 +0100 Subject: [PATCH 4/8] Updated MD5 artifacts for 1.6.5-CR1 (#318) Signed-off-by: Paolo Patierno --- bridge/image.yaml | 2 +- bridge/modules/bridge/module.yaml | 6 +-- ...0-Deployment-strimzi-cluster-operator.yaml | 38 +++++++++---------- .../05-Deployment-strimzi-topic-operator.yaml | 2 +- .../05-Deployment-strimzi-user-operator.yaml | 2 +- kafka/kafka-2.5.0/image.yaml | 2 +- kafka/kafka-2.6.0/image.yaml | 2 +- kafka/modules/kafka/2.5.0/module.yaml | 4 +- kafka/modules/kafka/2.6.0/module.yaml | 4 +- kafka/modules/kafka/base/module.yaml | 6 +-- operator/image.yaml | 2 +- operator/modules/operator/module.yaml | 14 +++---- 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/bridge/image.yaml b/bridge/image.yaml index a4bb074a..d2ec2891 100644 --- a/bridge/image.yaml +++ b/bridge/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-bridge-rhel7 description: "AMQ Streams image for running the Apache Kafka bridge" -version: "1.6.4" +version: "1.6.5" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/bridge/modules/bridge/module.yaml b/bridge/modules/bridge/module.yaml index 03f66903..87faa445 100644 --- a/bridge/modules/bridge/module.yaml +++ b/bridge/modules/bridge/module.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: bridge -version: 1.6.4 +version: 1.6.5 envs: - name: "STRIMZI_HOME" @@ -10,9 +10,9 @@ envs: value: "amqstreams-bridge-container" artifacts: - - md5: 6f9cacd0e38ec1b74b08098471297605 + - md5: 0e5751f98a9329b873e6f21023b3777d name: kafka-bridge.zip - - md5: 7d182ed200daa7bdc3afe33ef161a1b6 + - md5: 87c6841c7e28b66b1b01c9ee1963c0cc name: kafka-bridge-licenses.tar.gz packages: diff --git a/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml index 6ddbb5e1..afff6fe5 100644 --- a/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml +++ b/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml @@ -23,7 +23,7 @@ spec: name: strimzi-cluster-operator containers: - name: strimzi-cluster-operator - image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.4 + image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.5 ports: - containerPort: 8080 name: http @@ -42,41 +42,41 @@ spec: - name: STRIMZI_OPERATION_TIMEOUT_MS value: "300000" - name: STRIMZI_DEFAULT_TLS_SIDECAR_ENTITY_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 - name: STRIMZI_DEFAULT_TLS_SIDECAR_CRUISE_CONTROL_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 - name: STRIMZI_KAFKA_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.4 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.5 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 - name: STRIMZI_KAFKA_CONNECT_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.4 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.5 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 - name: STRIMZI_KAFKA_CONNECT_S2I_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.4 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.5 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.4 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.5 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.4 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.4 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.5 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.4 + value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.5 - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.4 + value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.5 - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE - value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.4 + value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.5 - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE - value: registry.redhat.io/amq7/amq-streams-bridge-rhel7:1.6.4 + value: registry.redhat.io/amq7/amq-streams-bridge-rhel7:1.6.5 livenessProbe: httpGet: path: /healthy diff --git a/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml b/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml index cf7c46d7..2cb03e62 100644 --- a/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml +++ b/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: strimzi-topic-operator containers: - name: strimzi-topic-operator - image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.4 + image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.5 args: - /opt/strimzi/bin/topic_operator_run.sh env: diff --git a/install/user-operator/05-Deployment-strimzi-user-operator.yaml b/install/user-operator/05-Deployment-strimzi-user-operator.yaml index 9bc29dca..e6c2d77d 100644 --- a/install/user-operator/05-Deployment-strimzi-user-operator.yaml +++ b/install/user-operator/05-Deployment-strimzi-user-operator.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: strimzi-user-operator containers: - name: strimzi-user-operator - image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.4 + image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.5 args: - /opt/strimzi/bin/user_operator_run.sh env: diff --git a/kafka/kafka-2.5.0/image.yaml b/kafka/kafka-2.5.0/image.yaml index 375db081..700fd87b 100644 --- a/kafka/kafka-2.5.0/image.yaml +++ b/kafka/kafka-2.5.0/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-kafka-25-rhel7 description: "AMQ Streams image for running Apache Kafka, Zookeeper, Kafka Connect, Mirror Maker and Cruise Control" -version: "1.6.4" +version: "1.6.5" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/kafka/kafka-2.6.0/image.yaml b/kafka/kafka-2.6.0/image.yaml index 95e54da5..08adcfdd 100644 --- a/kafka/kafka-2.6.0/image.yaml +++ b/kafka/kafka-2.6.0/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-kafka-26-rhel7 description: "AMQ Streams image for running Apache Kafka, Zookeeper, Kafka Connect, Mirror Maker and Cruise Control" -version: "1.6.4" +version: "1.6.5" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/kafka/modules/kafka/2.5.0/module.yaml b/kafka/modules/kafka/2.5.0/module.yaml index cfe43449..f4374e87 100644 --- a/kafka/modules/kafka/2.5.0/module.yaml +++ b/kafka/modules/kafka/2.5.0/module.yaml @@ -8,13 +8,13 @@ envs: value: "amqstreams-kafka-25-container" artifacts: - - md5: 1bc26a4790e1a2f520cba04cdfea678d + - md5: 7437d33a992d63ff6797a6dfa508e1fa name: streams-ocp-25.zip modules: install: - name: kafka.base - version: 1.6.4 + version: 1.6.5 execute: - script: install.sh diff --git a/kafka/modules/kafka/2.6.0/module.yaml b/kafka/modules/kafka/2.6.0/module.yaml index e30eba2b..d8e873dd 100644 --- a/kafka/modules/kafka/2.6.0/module.yaml +++ b/kafka/modules/kafka/2.6.0/module.yaml @@ -8,13 +8,13 @@ envs: value: "amqstreams-kafka-26-container" artifacts: - - md5: 85cee2b31ac41675e954bb12f240377c + - md5: fca00f80810b23306f23c46dab51b7ec name: streams-ocp-26.zip modules: install: - name: kafka.base - version: 1.6.4 + version: 1.6.5 execute: - script: install.sh diff --git a/kafka/modules/kafka/base/module.yaml b/kafka/modules/kafka/base/module.yaml index afd22feb..d30ceca0 100644 --- a/kafka/modules/kafka/base/module.yaml +++ b/kafka/modules/kafka/base/module.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: kafka.base -version: 1.6.4 +version: 1.6.5 envs: - name: "KAFKA_HOME" @@ -16,9 +16,9 @@ envs: value: "/opt/cruise-control" artifacts: - - md5: c5c48c3879094a42c271fbf561193b6e + - md5: 1b787fc75223bd5c2636646906d03fbc name: strimzi-kafka-scripts.zip - - md5: 946d7ae019f52e33fff6d8e6c31284ac + - md5: ab19352f588b5b39039021f4a0e7270b name: cruise-control-ocp.zip packages: diff --git a/operator/image.yaml b/operator/image.yaml index 47b71740..bf1d9c5c 100644 --- a/operator/image.yaml +++ b/operator/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-rhel7-operator description: "AMQ Streams image for the Cluster, Topic, User Operators, and Kafka init" -version: "1.6.4" +version: "1.6.5" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/operator/modules/operator/module.yaml b/operator/modules/operator/module.yaml index fd54c56c..d01cbbb7 100644 --- a/operator/modules/operator/module.yaml +++ b/operator/modules/operator/module.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: operator -version: 1.6.4 +version: 1.6.5 envs: - name: "STRIMZI_HOME" @@ -10,17 +10,17 @@ envs: value: "amqstreams-operator-container" artifacts: - - md5: 6866bbbd59375b9fc926485c2605b976 + - md5: 0731559b705d72cac77ab39c4be54f72 name: cluster-operator-dist.zip - - md5: e5a21f799e99dc72aa0be4c9593c3f48 + - md5: 469f6a4e669333e1d34a90b1b866ce89 name: topic-operator-dist.zip - - md5: b1a617272296d4e403d800e4ee98699e + - md5: 967f595ef315f5b0ded69ab7e9dbd547 name: user-operator-dist.zip - - md5: b8d14397bc5dc3d5e70316b03918cf92 + - md5: f7cc13a705b7b4866286dfc1f8e87847 name: kafka-init-dist.zip - - md5: 5c26111cacc5e361a2139e001629166a + - md5: be137722f9d510a5371ee3a6c5759498 name: strimzi-licenses.tar.gz - - md5: efe0691c0b82b61a2078a55f442b6be3 + - md5: 9abe217802bd0472719cae4a06c8b3ae name: strimzi-operator-scripts.zip packages: From 27f258ca7980b0004e2aedfa41eb377747d8523e Mon Sep 17 00:00:00 2001 From: Paolo Patierno Date: Tue, 11 Jan 2022 10:22:12 +0100 Subject: [PATCH 5/8] Updated MD5 artifacts for 1.6.6-CR1 (#329) Signed-off-by: Paolo Patierno --- bridge/image.yaml | 2 +- bridge/modules/bridge/module.yaml | 6 +-- ...0-Deployment-strimzi-cluster-operator.yaml | 38 +++++++++---------- .../05-Deployment-strimzi-topic-operator.yaml | 2 +- .../05-Deployment-strimzi-user-operator.yaml | 2 +- kafka/kafka-2.5.0/image.yaml | 2 +- kafka/kafka-2.6.0/image.yaml | 2 +- kafka/modules/kafka/2.5.0/module.yaml | 4 +- kafka/modules/kafka/2.6.0/module.yaml | 4 +- kafka/modules/kafka/base/module.yaml | 6 +-- operator/image.yaml | 2 +- operator/modules/operator/module.yaml | 14 +++---- 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/bridge/image.yaml b/bridge/image.yaml index d2ec2891..55164230 100644 --- a/bridge/image.yaml +++ b/bridge/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-bridge-rhel7 description: "AMQ Streams image for running the Apache Kafka bridge" -version: "1.6.5" +version: "1.6.6" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/bridge/modules/bridge/module.yaml b/bridge/modules/bridge/module.yaml index 87faa445..9236944a 100644 --- a/bridge/modules/bridge/module.yaml +++ b/bridge/modules/bridge/module.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: bridge -version: 1.6.5 +version: 1.6.6 envs: - name: "STRIMZI_HOME" @@ -10,9 +10,9 @@ envs: value: "amqstreams-bridge-container" artifacts: - - md5: 0e5751f98a9329b873e6f21023b3777d + - md5: 0c9082b3dcc560991f6f5ea42365b53c name: kafka-bridge.zip - - md5: 87c6841c7e28b66b1b01c9ee1963c0cc + - md5: 4fff28d4ea6c97052f690a357eb0ed55 name: kafka-bridge-licenses.tar.gz packages: diff --git a/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml index afff6fe5..24df4397 100644 --- a/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml +++ b/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml @@ -23,7 +23,7 @@ spec: name: strimzi-cluster-operator containers: - name: strimzi-cluster-operator - image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.5 + image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.6 ports: - containerPort: 8080 name: http @@ -42,41 +42,41 @@ spec: - name: STRIMZI_OPERATION_TIMEOUT_MS value: "300000" - name: STRIMZI_DEFAULT_TLS_SIDECAR_ENTITY_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 - name: STRIMZI_DEFAULT_TLS_SIDECAR_CRUISE_CONTROL_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 - name: STRIMZI_KAFKA_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.5 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.6 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 - name: STRIMZI_KAFKA_CONNECT_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.5 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.6 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 - name: STRIMZI_KAFKA_CONNECT_S2I_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.5 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.6 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.5 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.6 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.5 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.5 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.6 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.5 + value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.6 - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.5 + value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.6 - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE - value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.5 + value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.6 - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE - value: registry.redhat.io/amq7/amq-streams-bridge-rhel7:1.6.5 + value: registry.redhat.io/amq7/amq-streams-bridge-rhel7:1.6.6 livenessProbe: httpGet: path: /healthy diff --git a/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml b/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml index 2cb03e62..13e5f595 100644 --- a/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml +++ b/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: strimzi-topic-operator containers: - name: strimzi-topic-operator - image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.5 + image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.6 args: - /opt/strimzi/bin/topic_operator_run.sh env: diff --git a/install/user-operator/05-Deployment-strimzi-user-operator.yaml b/install/user-operator/05-Deployment-strimzi-user-operator.yaml index e6c2d77d..6a31cff8 100644 --- a/install/user-operator/05-Deployment-strimzi-user-operator.yaml +++ b/install/user-operator/05-Deployment-strimzi-user-operator.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: strimzi-user-operator containers: - name: strimzi-user-operator - image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.5 + image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.6 args: - /opt/strimzi/bin/user_operator_run.sh env: diff --git a/kafka/kafka-2.5.0/image.yaml b/kafka/kafka-2.5.0/image.yaml index 700fd87b..e527a01d 100644 --- a/kafka/kafka-2.5.0/image.yaml +++ b/kafka/kafka-2.5.0/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-kafka-25-rhel7 description: "AMQ Streams image for running Apache Kafka, Zookeeper, Kafka Connect, Mirror Maker and Cruise Control" -version: "1.6.5" +version: "1.6.6" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/kafka/kafka-2.6.0/image.yaml b/kafka/kafka-2.6.0/image.yaml index 08adcfdd..a5e7f3aa 100644 --- a/kafka/kafka-2.6.0/image.yaml +++ b/kafka/kafka-2.6.0/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-kafka-26-rhel7 description: "AMQ Streams image for running Apache Kafka, Zookeeper, Kafka Connect, Mirror Maker and Cruise Control" -version: "1.6.5" +version: "1.6.6" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/kafka/modules/kafka/2.5.0/module.yaml b/kafka/modules/kafka/2.5.0/module.yaml index f4374e87..08a42f94 100644 --- a/kafka/modules/kafka/2.5.0/module.yaml +++ b/kafka/modules/kafka/2.5.0/module.yaml @@ -8,13 +8,13 @@ envs: value: "amqstreams-kafka-25-container" artifacts: - - md5: 7437d33a992d63ff6797a6dfa508e1fa + - md5: a28f4032e20001d44bff01370c2713ed name: streams-ocp-25.zip modules: install: - name: kafka.base - version: 1.6.5 + version: 1.6.6 execute: - script: install.sh diff --git a/kafka/modules/kafka/2.6.0/module.yaml b/kafka/modules/kafka/2.6.0/module.yaml index d8e873dd..623f8bfc 100644 --- a/kafka/modules/kafka/2.6.0/module.yaml +++ b/kafka/modules/kafka/2.6.0/module.yaml @@ -8,13 +8,13 @@ envs: value: "amqstreams-kafka-26-container" artifacts: - - md5: fca00f80810b23306f23c46dab51b7ec + - md5: ab8bb196988fb6443d4fbc2a97d10729 name: streams-ocp-26.zip modules: install: - name: kafka.base - version: 1.6.5 + version: 1.6.6 execute: - script: install.sh diff --git a/kafka/modules/kafka/base/module.yaml b/kafka/modules/kafka/base/module.yaml index d30ceca0..cdc252d6 100644 --- a/kafka/modules/kafka/base/module.yaml +++ b/kafka/modules/kafka/base/module.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: kafka.base -version: 1.6.5 +version: 1.6.6 envs: - name: "KAFKA_HOME" @@ -16,9 +16,9 @@ envs: value: "/opt/cruise-control" artifacts: - - md5: 1b787fc75223bd5c2636646906d03fbc + - md5: 7e052a4c5b9bf21cb46da2f9178e4de0 name: strimzi-kafka-scripts.zip - - md5: ab19352f588b5b39039021f4a0e7270b + - md5: b70d517f50339551d1f2511861569171 name: cruise-control-ocp.zip packages: diff --git a/operator/image.yaml b/operator/image.yaml index bf1d9c5c..98aff077 100644 --- a/operator/image.yaml +++ b/operator/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-rhel7-operator description: "AMQ Streams image for the Cluster, Topic, User Operators, and Kafka init" -version: "1.6.5" +version: "1.6.6" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/operator/modules/operator/module.yaml b/operator/modules/operator/module.yaml index d01cbbb7..0da1919b 100644 --- a/operator/modules/operator/module.yaml +++ b/operator/modules/operator/module.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: operator -version: 1.6.5 +version: 1.6.6 envs: - name: "STRIMZI_HOME" @@ -10,17 +10,17 @@ envs: value: "amqstreams-operator-container" artifacts: - - md5: 0731559b705d72cac77ab39c4be54f72 + - md5: ac080a4ff9908f5955e9f78137e92d23 name: cluster-operator-dist.zip - - md5: 469f6a4e669333e1d34a90b1b866ce89 + - md5: 1561dd7824758ca539aac90e36dc096d name: topic-operator-dist.zip - - md5: 967f595ef315f5b0ded69ab7e9dbd547 + - md5: 971bcabdcb6a239af4ea7d60e46b8c10 name: user-operator-dist.zip - - md5: f7cc13a705b7b4866286dfc1f8e87847 + - md5: 0ee77206d06948aafcafc990a6f328fe name: kafka-init-dist.zip - - md5: be137722f9d510a5371ee3a6c5759498 + - md5: 952e9f9492653f4608e530573207ca6d name: strimzi-licenses.tar.gz - - md5: 9abe217802bd0472719cae4a06c8b3ae + - md5: 910fd3b77a450d6919f60b48f101d844 name: strimzi-operator-scripts.zip packages: From 6893970c7695b1d6860688d78dc8d5ddd2668292 Mon Sep 17 00:00:00 2001 From: Paolo Patierno Date: Tue, 11 Jan 2022 11:35:47 +0100 Subject: [PATCH 6/8] Fixed MD5 for Kafka related artifacts (#330) Signed-off-by: Paolo Patierno --- kafka/modules/kafka/2.5.0/module.yaml | 2 +- kafka/modules/kafka/2.6.0/module.yaml | 2 +- kafka/modules/kafka/base/module.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kafka/modules/kafka/2.5.0/module.yaml b/kafka/modules/kafka/2.5.0/module.yaml index 08a42f94..1ec7f485 100644 --- a/kafka/modules/kafka/2.5.0/module.yaml +++ b/kafka/modules/kafka/2.5.0/module.yaml @@ -8,7 +8,7 @@ envs: value: "amqstreams-kafka-25-container" artifacts: - - md5: a28f4032e20001d44bff01370c2713ed + - md5: 7f16cfad1fb08bf721d7a21d4fe71676 name: streams-ocp-25.zip modules: diff --git a/kafka/modules/kafka/2.6.0/module.yaml b/kafka/modules/kafka/2.6.0/module.yaml index 623f8bfc..b0b0669a 100644 --- a/kafka/modules/kafka/2.6.0/module.yaml +++ b/kafka/modules/kafka/2.6.0/module.yaml @@ -8,7 +8,7 @@ envs: value: "amqstreams-kafka-26-container" artifacts: - - md5: ab8bb196988fb6443d4fbc2a97d10729 + - md5: d56e6c0a800a805120d184670635d8f5 name: streams-ocp-26.zip modules: diff --git a/kafka/modules/kafka/base/module.yaml b/kafka/modules/kafka/base/module.yaml index cdc252d6..fc8c721a 100644 --- a/kafka/modules/kafka/base/module.yaml +++ b/kafka/modules/kafka/base/module.yaml @@ -18,7 +18,7 @@ envs: artifacts: - md5: 7e052a4c5b9bf21cb46da2f9178e4de0 name: strimzi-kafka-scripts.zip - - md5: b70d517f50339551d1f2511861569171 + - md5: 47829afb80ae2af08e65fb6185f0e44e name: cruise-control-ocp.zip packages: From 76e1a7814a11c05ce14b306ee396cb7b3a160e2d Mon Sep 17 00:00:00 2001 From: Paolo Patierno Date: Wed, 12 Jan 2022 14:58:33 +0100 Subject: [PATCH 7/8] Fixed bridge MD5 for CR2 (#331) Signed-off-by: Paolo Patierno --- bridge/modules/bridge/module.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridge/modules/bridge/module.yaml b/bridge/modules/bridge/module.yaml index 9236944a..2de4b331 100644 --- a/bridge/modules/bridge/module.yaml +++ b/bridge/modules/bridge/module.yaml @@ -10,9 +10,9 @@ envs: value: "amqstreams-bridge-container" artifacts: - - md5: 0c9082b3dcc560991f6f5ea42365b53c + - md5: bb014371edac82ea4c49c754c0e5cdb3 name: kafka-bridge.zip - - md5: 4fff28d4ea6c97052f690a357eb0ed55 + - md5: 9c176a3e90351ebc5ef437f8ccd1c1d0 name: kafka-bridge-licenses.tar.gz packages: From aabb882c379fe403033ee21670bdef694102cf36 Mon Sep 17 00:00:00 2001 From: Paolo Patierno Date: Tue, 1 Feb 2022 14:47:25 +0100 Subject: [PATCH 8/8] Updated artifact MD5s to 1.6.7.CR1 (#335) Updated version to 1.6.7 in modules, images and deployment Signed-off-by: Paolo Patierno --- bridge/image.yaml | 2 +- bridge/modules/bridge/module.yaml | 6 +-- ...0-Deployment-strimzi-cluster-operator.yaml | 38 +++++++++---------- .../05-Deployment-strimzi-user-operator.yaml | 2 +- kafka/kafka-2.5.0/image.yaml | 2 +- kafka/kafka-2.6.0/image.yaml | 2 +- kafka/modules/kafka/2.5.0/module.yaml | 4 +- kafka/modules/kafka/2.6.0/module.yaml | 4 +- kafka/modules/kafka/base/module.yaml | 6 +-- operator/image.yaml | 2 +- operator/modules/operator/module.yaml | 14 +++---- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/bridge/image.yaml b/bridge/image.yaml index 55164230..03eb94b9 100644 --- a/bridge/image.yaml +++ b/bridge/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-bridge-rhel7 description: "AMQ Streams image for running the Apache Kafka bridge" -version: "1.6.6" +version: "1.6.7" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/bridge/modules/bridge/module.yaml b/bridge/modules/bridge/module.yaml index 2de4b331..4417561a 100644 --- a/bridge/modules/bridge/module.yaml +++ b/bridge/modules/bridge/module.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: bridge -version: 1.6.6 +version: 1.6.7 envs: - name: "STRIMZI_HOME" @@ -10,9 +10,9 @@ envs: value: "amqstreams-bridge-container" artifacts: - - md5: bb014371edac82ea4c49c754c0e5cdb3 + - md5: afc7c9488730f59912e912fbaf3991ca name: kafka-bridge.zip - - md5: 9c176a3e90351ebc5ef437f8ccd1c1d0 + - md5: 03c89ebd8f30f1542f5a32def2f7bbb3 name: kafka-bridge-licenses.tar.gz packages: diff --git a/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml index 24df4397..3df53785 100644 --- a/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml +++ b/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml @@ -23,7 +23,7 @@ spec: name: strimzi-cluster-operator containers: - name: strimzi-cluster-operator - image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.6 + image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.7 ports: - containerPort: 8080 name: http @@ -42,41 +42,41 @@ spec: - name: STRIMZI_OPERATION_TIMEOUT_MS value: "300000" - name: STRIMZI_DEFAULT_TLS_SIDECAR_ENTITY_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.7 - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.7 - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.7 - name: STRIMZI_DEFAULT_TLS_SIDECAR_CRUISE_CONTROL_IMAGE - value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 + value: registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.7 - name: STRIMZI_KAFKA_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.6 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.7 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.7 - name: STRIMZI_KAFKA_CONNECT_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.6 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.7 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.7 - name: STRIMZI_KAFKA_CONNECT_S2I_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.6 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.7 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.7 - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.6 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.7 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.7 - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES value: | - 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.6 - 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.6 + 2.5.0=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.6.7 + 2.6.0=registry.redhat.io/amq7/amq-streams-kafka-26-rhel7:1.6.7 - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.6 + value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.7 - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE - value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.6 + value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.7 - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE - value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.6 + value: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.7 - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE - value: registry.redhat.io/amq7/amq-streams-bridge-rhel7:1.6.6 + value: registry.redhat.io/amq7/amq-streams-bridge-rhel7:1.6.7 livenessProbe: httpGet: path: /healthy diff --git a/install/user-operator/05-Deployment-strimzi-user-operator.yaml b/install/user-operator/05-Deployment-strimzi-user-operator.yaml index 6a31cff8..3b0f12ea 100644 --- a/install/user-operator/05-Deployment-strimzi-user-operator.yaml +++ b/install/user-operator/05-Deployment-strimzi-user-operator.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: strimzi-user-operator containers: - name: strimzi-user-operator - image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.6 + image: registry.redhat.io/amq7/amq-streams-rhel7-operator:1.6.7 args: - /opt/strimzi/bin/user_operator_run.sh env: diff --git a/kafka/kafka-2.5.0/image.yaml b/kafka/kafka-2.5.0/image.yaml index e527a01d..23c7a51b 100644 --- a/kafka/kafka-2.5.0/image.yaml +++ b/kafka/kafka-2.5.0/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-kafka-25-rhel7 description: "AMQ Streams image for running Apache Kafka, Zookeeper, Kafka Connect, Mirror Maker and Cruise Control" -version: "1.6.6" +version: "1.6.7" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/kafka/kafka-2.6.0/image.yaml b/kafka/kafka-2.6.0/image.yaml index a5e7f3aa..35020c44 100644 --- a/kafka/kafka-2.6.0/image.yaml +++ b/kafka/kafka-2.6.0/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-kafka-26-rhel7 description: "AMQ Streams image for running Apache Kafka, Zookeeper, Kafka Connect, Mirror Maker and Cruise Control" -version: "1.6.6" +version: "1.6.7" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/kafka/modules/kafka/2.5.0/module.yaml b/kafka/modules/kafka/2.5.0/module.yaml index 1ec7f485..c840dac3 100644 --- a/kafka/modules/kafka/2.5.0/module.yaml +++ b/kafka/modules/kafka/2.5.0/module.yaml @@ -8,13 +8,13 @@ envs: value: "amqstreams-kafka-25-container" artifacts: - - md5: 7f16cfad1fb08bf721d7a21d4fe71676 + - md5: 4ef4c7cf6d7c61d60ab9010cb161a803 name: streams-ocp-25.zip modules: install: - name: kafka.base - version: 1.6.6 + version: 1.6.7 execute: - script: install.sh diff --git a/kafka/modules/kafka/2.6.0/module.yaml b/kafka/modules/kafka/2.6.0/module.yaml index b0b0669a..ff886849 100644 --- a/kafka/modules/kafka/2.6.0/module.yaml +++ b/kafka/modules/kafka/2.6.0/module.yaml @@ -8,13 +8,13 @@ envs: value: "amqstreams-kafka-26-container" artifacts: - - md5: d56e6c0a800a805120d184670635d8f5 + - md5: 0a1f7c455b362e2b8cace4c2301f86d3 name: streams-ocp-26.zip modules: install: - name: kafka.base - version: 1.6.6 + version: 1.6.7 execute: - script: install.sh diff --git a/kafka/modules/kafka/base/module.yaml b/kafka/modules/kafka/base/module.yaml index fc8c721a..6c4a6266 100644 --- a/kafka/modules/kafka/base/module.yaml +++ b/kafka/modules/kafka/base/module.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: kafka.base -version: 1.6.6 +version: 1.6.7 envs: - name: "KAFKA_HOME" @@ -16,9 +16,9 @@ envs: value: "/opt/cruise-control" artifacts: - - md5: 7e052a4c5b9bf21cb46da2f9178e4de0 + - md5: b87482e198e541e0a1511ae338139895 name: strimzi-kafka-scripts.zip - - md5: 47829afb80ae2af08e65fb6185f0e44e + - md5: 1129321378c806a65bea99cc8e95cebd name: cruise-control-ocp.zip packages: diff --git a/operator/image.yaml b/operator/image.yaml index 98aff077..a54cd684 100644 --- a/operator/image.yaml +++ b/operator/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: amq7/amq-streams-rhel7-operator description: "AMQ Streams image for the Cluster, Topic, User Operators, and Kafka init" -version: "1.6.6" +version: "1.6.7" from: registry.redhat.io/ubi7/ubi-minimal labels: diff --git a/operator/modules/operator/module.yaml b/operator/modules/operator/module.yaml index 0da1919b..bbf6a9bf 100644 --- a/operator/modules/operator/module.yaml +++ b/operator/modules/operator/module.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: operator -version: 1.6.6 +version: 1.6.7 envs: - name: "STRIMZI_HOME" @@ -10,17 +10,17 @@ envs: value: "amqstreams-operator-container" artifacts: - - md5: ac080a4ff9908f5955e9f78137e92d23 + - md5: 60f96a66953c8f725ce288f9c65d24fc name: cluster-operator-dist.zip - - md5: 1561dd7824758ca539aac90e36dc096d + - md5: a64f0f34f006b397e6bbd84c4a017155 name: topic-operator-dist.zip - - md5: 971bcabdcb6a239af4ea7d60e46b8c10 + - md5: 13d6c059a0a1b73954e62dae47dd4c3b name: user-operator-dist.zip - - md5: 0ee77206d06948aafcafc990a6f328fe + - md5: bf27d4c66a8432e6dcd9af34dc0f4924 name: kafka-init-dist.zip - - md5: 952e9f9492653f4608e530573207ca6d + - md5: 0254b1ca0643ef266ae7d2f588b76d85 name: strimzi-licenses.tar.gz - - md5: 910fd3b77a450d6919f60b48f101d844 + - md5: 8a789cdc1ff4bae828e7c44754eb3823 name: strimzi-operator-scripts.zip packages: