Skip to content

Commit

Permalink
Merge branch 'amqstreams16-dev' into amqstreams16
Browse files Browse the repository at this point in the history
  • Loading branch information
kyguy committed Mar 1, 2022
2 parents cecd4aa + aabb882 commit 1aceab5
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion bridge/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.7"
from: registry.redhat.io/ubi7/ubi-minimal

labels:
Expand Down
6 changes: 3 additions & 3 deletions bridge/modules/bridge/module.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: 1

name: bridge
version: 1.6.4
version: 1.6.7

envs:
- name: "STRIMZI_HOME"
Expand All @@ -10,9 +10,9 @@ envs:
value: "amqstreams-bridge-container"

artifacts:
- md5: 6f9cacd0e38ec1b74b08098471297605
- md5: afc7c9488730f59912e912fbaf3991ca
name: kafka-bridge.zip
- md5: 7d182ed200daa7bdc3afe33ef161a1b6
- md5: 03c89ebd8f30f1542f5a32def2f7bbb3
name: kafka-bridge-licenses.tar.gz

packages:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.7
ports:
- containerPort: 8080
name: http
Expand All @@ -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.7
- 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.7
- 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.7
- 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.7
- 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.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.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.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.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.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.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.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.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.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.4
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.4
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.4
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.4
value: registry.redhat.io/amq7/amq-streams-bridge-rhel7:1.6.7
livenessProbe:
httpGet:
path: /healthy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.6
args:
- /opt/strimzi/bin/topic_operator_run.sh
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.7
args:
- /opt/strimzi/bin/user_operator_run.sh
env:
Expand Down
2 changes: 1 addition & 1 deletion kafka/kafka-2.5.0/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.7"
from: registry.redhat.io/ubi7/ubi-minimal

labels:
Expand Down
2 changes: 1 addition & 1 deletion kafka/kafka-2.6.0/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.7"
from: registry.redhat.io/ubi7/ubi-minimal

labels:
Expand Down
4 changes: 2 additions & 2 deletions kafka/modules/kafka/2.5.0/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ envs:
value: "amqstreams-kafka-25-container"

artifacts:
- md5: 1bc26a4790e1a2f520cba04cdfea678d
- md5: 4ef4c7cf6d7c61d60ab9010cb161a803
name: streams-ocp-25.zip

modules:
install:
- name: kafka.base
version: 1.6.4
version: 1.6.7

execute:
- script: install.sh
4 changes: 2 additions & 2 deletions kafka/modules/kafka/2.6.0/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ envs:
value: "amqstreams-kafka-26-container"

artifacts:
- md5: 85cee2b31ac41675e954bb12f240377c
- md5: 0a1f7c455b362e2b8cace4c2301f86d3
name: streams-ocp-26.zip

modules:
install:
- name: kafka.base
version: 1.6.4
version: 1.6.7

execute:
- script: install.sh
6 changes: 3 additions & 3 deletions kafka/modules/kafka/base/module.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: 1

name: kafka.base
version: 1.6.4
version: 1.6.7

envs:
- name: "KAFKA_HOME"
Expand All @@ -16,9 +16,9 @@ envs:
value: "/opt/cruise-control"

artifacts:
- md5: c5c48c3879094a42c271fbf561193b6e
- md5: b87482e198e541e0a1511ae338139895
name: strimzi-kafka-scripts.zip
- md5: 946d7ae019f52e33fff6d8e6c31284ac
- md5: 1129321378c806a65bea99cc8e95cebd
name: cruise-control-ocp.zip

packages:
Expand Down
2 changes: 1 addition & 1 deletion operator/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.7"
from: registry.redhat.io/ubi7/ubi-minimal

labels:
Expand Down
14 changes: 7 additions & 7 deletions operator/modules/operator/module.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: 1

name: operator
version: 1.6.4
version: 1.6.7

envs:
- name: "STRIMZI_HOME"
Expand All @@ -10,17 +10,17 @@ envs:
value: "amqstreams-operator-container"

artifacts:
- md5: 6866bbbd59375b9fc926485c2605b976
- md5: 60f96a66953c8f725ce288f9c65d24fc
name: cluster-operator-dist.zip
- md5: e5a21f799e99dc72aa0be4c9593c3f48
- md5: a64f0f34f006b397e6bbd84c4a017155
name: topic-operator-dist.zip
- md5: b1a617272296d4e403d800e4ee98699e
- md5: 13d6c059a0a1b73954e62dae47dd4c3b
name: user-operator-dist.zip
- md5: b8d14397bc5dc3d5e70316b03918cf92
- md5: bf27d4c66a8432e6dcd9af34dc0f4924
name: kafka-init-dist.zip
- md5: 5c26111cacc5e361a2139e001629166a
- md5: 0254b1ca0643ef266ae7d2f588b76d85
name: strimzi-licenses.tar.gz
- md5: efe0691c0b82b61a2078a55f442b6be3
- md5: 8a789cdc1ff4bae828e7c44754eb3823
name: strimzi-operator-scripts.zip

packages:
Expand Down

0 comments on commit 1aceab5

Please sign in to comment.