update github action matrix

osodevops · Feb 7, 2023 · 0d2af1e · 0d2af1e
1 parent 4c826e2
commit 0d2af1e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 26 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,9 +10,23 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        strimzi_version: ["0.32.0"]
-        kafka_version: ["3.3.1"]
-        aws_msk_iam_auth_version: ["1.1.6"]
+        strimzi_kafka_version: 
+          - "0.33.0-kafka-3.2.3"
+          - "0.33.0-kafka-3.3.2"
+          - "0.33.0-kafka-3.3.1"
+          - "0.33.0-kafka-3.2.1"
+          - "0.33.0-kafka-3.2.0"
+          - "0.32.0-kafka-3.2.1"
+          - "0.32.0-kafka-3.2.0"
+          - "0.32.0-kafka-3.2.3"
+          - "0.32.0-kafka-3.3.1"
+          - "0.31.0-kafka-3.1.0"
+          - "0.31.0-kafka-3.1.1"
+          - "0.31.0-kafka-3.2.1"
+          - "0.31.0-kafka-3.2.0"
+        aws_msk_iam_auth_version:
+          - "latest"
+          - "1.1.6"
     steps:
       - uses: actions/checkout@v2
 
@@ -21,9 +35,6 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
@@ -32,9 +43,8 @@ jobs:
         with:
           push: true
           build-args: |
-            STRIMZI_VERSION=${{ matrix.strimzi_version }}
-            KAFKA_VERSION=${{ matrix.kafka_version }}
+            STRIMZI_KAFKA_VERSION=${{ matrix.strimzi_kafka_version }}
             AWS_MSK_IAM_AUTH_VERSION=${{ matrix.aws_msk_iam_auth_version }}
           tags: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/strimzi-kafka-operator-aws-msk-iam-auth:latest
-            ${{ secrets.DOCKER_HUB_USERNAME }}/strimzi-kafka-operator-aws-msk-iam-auth:${{ matrix.strimzi_version }}-kafka-${{ matrix.kafka_version }}-aws-${{ matrix.aws_msk_iam_auth_version }}
+            ${{ secrets.DOCKER_HUB_USERNAME }}/strimzi-kafka-operator-aws-msk-iam-auth:${{ matrix.strimzi_kafka_version }}-aws-${{ matrix.aws_msk_iam_auth_version }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,6 @@
-ARG STRIMZI_VERSION="0.32.0"
-ARG KAFKA_VERSION="3.3.1"
+ARG STRIMZI_KAFKA_TAG="0.33.0-kafka-3.3.2"
 
-FROM quay.io/strimzi/kafka:${STRIMZI_VERSION}-kafka-${KAFKA_VERSION}
+FROM quay.io/strimzi/kafka:${STRIMZI_KAFKA_TAG}
 
 ARG AWS_MSK_IAM_AUTH_VERSION="1.1.6"
 ENV CLASSPATH=/opt/kafka/libs/aws-msk-iam-auth-${AWS_MSK_IAM_AUTH_VERSION}-all.jar

diff --git a/Makefile b/Makefile
@@ -1,9 +1,8 @@
 SHELL := /bin/bash
 NAME := strimzi-kafka-operator-aws-msk-iam-auth
-STRIMZI_VERSION := 0.32.0
-KAFKA_VERSION := 3.3.1
-AWS_MSK_IAM_AUTH_VERSION := 1.1.6
-TAG := ${STRIMZI_VERSION}-kafka-${KAFKA_VERSION}-aws-${AWS_MSK_IAM_AUTH_VERSION}
+STRIMZI_KAFKA_TAG := 0.33.0-kafka-3.3.2
+AWS_MSK_IAM_AUTH_VERSION := latest
+TAG := ${STRIMZI_KAFKA_TAG}-aws-${AWS_MSK_IAM_AUTH_VERSION}
 
 .PHONY: help all
 
@@ -13,15 +12,9 @@ help: ## This help.
 .DEFAULT_GOAL := help
 
 build: ## Build docker images
-	docker build . -t $(NAME) --build-arg STRIMZI_VERSION=$(STRIMZI_VERSION) --build-arg KAFKA_VERSION=$(KAFKA_VERSION) --build-arg AWS_MSK_IAM_AUTH_VERSION=$(AWS_MSK_IAM_AUTH_VERSION)  
+	docker build . -t $(NAME) --build-arg STRIMZI_KAFKA_TAG=$(STRIMZI_KAFKA_TAG) --build-arg AWS_MSK_IAM_AUTH_VERSION=$(AWS_MSK_IAM_AUTH_VERSION)  
 	docker tag $(NAME) aidanmelen/$(NAME):$(TAG)
 	docker tag $(NAME) aidanmelen/$(NAME):latest
 
 dev: ## dev docker images
-	docker run -it --rm --entrypoint /bin/bash $(NAME)
-
-release: build ## Push docker images
-	docker login aidanmelen
-
-	docker push aidanmelen/$(NAME):$(TAG)
-	docker push aidanmelen/$(NAME):latest
+	docker run -it --rm --entrypoint /bin/bash $(NAME)
diff --git a/examples/connect.yaml b/examples/connect.yaml
@@ -3,7 +3,7 @@ kind: KafkaConnect
 metadata:
   name: my-connect
 spec:
-  image: aidanmelen/strimzi-kafka-operator-aws-msk-iam-auth:0.32.0-kafka-3.3.1-1.1.6
+  image: aidanmelen/strimzi-kafka-operator-aws-msk-iam-auth:0.32.0-kafka-3.3.1-aws-1.1.6
   replicas: 1
   bootstrapServers: "${BOOTSTRAP_BROKERS_SASL_IAM}"
   template:

diff --git a/examples/mirrormaker2.yaml b/examples/mirrormaker2.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker2
 metadata:
   name: my-mirror-maker-2
 spec:
-  image: aidanmelen/strimzi-kafka-operator-aws-msk-iam-auth:0.32.0-kafka-3.3.1-1.1.6
+  image: aidanmelen/strimzi-kafka-operator-aws-msk-iam-auth:0.33.0-kafka-3.3.2-aws-1.1.6
   replicas: 1
   bootstrapServers: "${BOOTSTRAP_BROKERS_SASL_IAM}"
   template: