Render instal files from Helm Charts, install CRDs, and other smaller changes

.azure/build-pipeline.yaml

@@ -47,7 +47,7 @@ stages:
   - stage: container_publish
     displayName: Publish Container
     dependsOn:
-      - container_build
+      - run_systemtests
     condition: and(succeeded(), eq(variables['build.sourceBranch'], 'refs/heads/main'))
     jobs:
       - template: 'templates/jobs/push_container.yaml'

.azure/scripts/uncommitted-changes.sh

@@ -5,9 +5,10 @@ echo "Build reason: ${BUILD_REASON}"
 echo "Source branch: ${BRANCH}"
 
 make crd_install
+make helm_install
 
-CHANGED_DERIVED=$(git diff --name-status -- packaging/install/)
-GENERATED_FILES=$(git ls-files --other --exclude-standard -- packaging/install/)
+CHANGED_DERIVED=$(git diff --name-status -- packaging/install/ packaging/helm-charts/)
+GENERATED_FILES=$(git ls-files --other --exclude-standard -- packaging/install/ packaging/helm-charts/)
 if [ -n "$CHANGED_DERIVED" ] || [ -n "$GENERATED_FILES" ] ; then
     if [ -n "$CHANGED_DERIVED" ] ; then
         echo "ERROR: Uncommitted changes in derived resources:"
@@ -21,6 +22,7 @@ if [ -n "$CHANGED_DERIVED" ] || [ -n "$GENERATED_FILES" ] ; then
 
     echo "Run the following to add up-to-date resources:"
     echo "  make crd_install \\"
+    echo "    && make helm_install \\"
     echo "    && git add packaging/ \\"
     echo "    && git commit -s -m 'Update derived resources'"
     exit 1

Dockerfile

@@ -9,14 +9,14 @@ RUN microdnf update -y \
     && microdnf clean all -y
 
 # Set JAVA_HOME env var
-ENV JAVA_HOME /usr/lib/jvm/jre-17
+ENV JAVA_HOME=/usr/lib/jvm/jre-17
 
 # Add strimzi user with UID 1001
 # The user is in the group 0 to have access to the mounted volumes and storage
 RUN useradd -r -m -u 1001 -g 0 strimzi
 
 ARG access_operator_version=1.0-SNAPSHOT
-ENV ACCESS_OPERATOR_VERSION ${access_operator_version}
+ENV ACCESS_OPERATOR_VERSION=${access_operator_version}
 ENV STRIMZI_HOME=/opt/strimzi
 RUN mkdir -p ${STRIMZI_HOME}
 WORKDIR ${STRIMZI_HOME}
@@ -29,7 +29,7 @@ COPY operator/target/operator-${access_operator_version} ./
 #####
 # Add Tini
 #####
-ENV TINI_VERSION v0.19.0
+ENV TINI_VERSION=v0.19.0
 ENV TINI_SHA256_AMD64=93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c
 ENV TINI_SHA256_ARM64=07952557df20bfd2a95f9bef198b445e006171969499a1d361bd9e6f8e5e0e81
 ENV TINI_SHA256_PPC64LE=3f658420974768e40810001a038c29d003728c5fe86da211cff5059e48cfdfde

Makefile

@@ -41,7 +41,7 @@ release_pkg:
 	$(FIND) ./packaging/install/ -mindepth 1 -maxdepth 1 ! -name Makefile -type f,d -exec $(CP) -rv {} ./install/ \;
 
 .PHONY: all
-all: java_package docker_build docker_push crd_install
+all: java_package docker_build docker_push crd_install helm_install
 
 .PHONY: build
 build: java_verify crd_install docker_build
@@ -53,6 +53,17 @@ clean: java_clean
 crd_install:
 	$(CP) ./api/target/classes/META-INF/fabric8/kafkaaccesses.access.strimzi.io-v1.yml ./packaging/install/040-Crd-kafkaaccess.yaml
 	yq eval -i '.metadata.labels."servicebinding.io/provisioned-service"="true"' ./packaging/install/040-Crd-kafkaaccess.yaml
+	$(CP) ./api/target/classes/META-INF/fabric8/kafkaaccesses.access.strimzi.io-v1.yml ./packaging/helm-charts/helm3/strimzi-access-operator/crds/040-Crd-kafkaaccess.yaml
+	yq eval -i '.metadata.labels."servicebinding.io/provisioned-service"="true"' ./packaging/helm-charts/helm3/strimzi-access-operator/crds/040-Crd-kafkaaccess.yaml
+
+.PHONY: helm_install
+helm_install:
+	mkdir -p ./target/helm
+	helm template --namespace strimzi-access-operator --output-dir ./target/helm ./packaging/helm-charts/helm3/strimzi-access-operator/
+	$(FIND) ./target/helm/strimzi-access-operator/templates/ -type f -name '*.yaml' -exec $(SED) -i '/^---/d' {} \;
+	$(FIND) ./target/helm/strimzi-access-operator/templates/ -type f -name '*.yaml' -exec $(SED) -i '/^# Source: /d' {} \;
+	$(CP) -v ./target/helm/strimzi-access-operator/templates/*.yaml ./packaging/install/
+	rm -rf ./target/helm
 
 .PHONY: next_version
 next_version:

packaging/helm-charts/helm3/kafka-access-operator/crds/040-Crd-kafkaaccess.yaml → packaging/helm-charts/helm3/strimzi-access-operator/crds/040-Crd-kafkaaccess.yaml

@@ -1,4 +1,4 @@
----
+# Generated by Fabric8 CRDGenerator, manual edits might get overwritten!
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -23,28 +23,28 @@ spec:
               properties:
                 kafka:
                   properties:
+                    listener:
+                      type: string
                     name:
                       type: string
                     namespace:
                       type: string
-                    listener:
-                      type: string
                   required:
                     - name
                   type: object
                 user:
                   properties:
-                    kind:
-                      type: string
                     apiGroup:
                       type: string
+                    kind:
+                      type: string
                     name:
                       type: string
                     namespace:
                       type: string
                   required:
-                    - kind
                     - apiGroup
+                    - kind
                     - name
                   type: object
               required:
@@ -60,20 +60,20 @@ spec:
                 conditions:
                   items:
                     properties:
-                      status:
+                      additionalProperties:
+                        additionalProperties:
+                          type: object
+                        type: object
+                      lastTransitionTime:
+                        type: string
+                      message:
                         type: string
                       reason:
                         type: string
-                      message:
+                      status:
                         type: string
                       type:
                         type: string
-                      lastTransitionTime:
-                        type: string
-                      additionalProperties:
-                        additionalProperties:
-                          type: object
-                        type: object
                     type: object
                   type: array
                 observedGeneration:

packaging/helm-charts/helm3/kafka-access-operator/values.yaml → packaging/helm-charts/helm3/strimzi-access-operator/values.yaml

@@ -1,7 +1,5 @@
 image:
-  # TODO until first release is there
   tag: latest
-  pullPolicy: Always
 
 resources:
   limits:

packaging/install/050-Deployment.yaml

@@ -11,6 +11,8 @@ spec:
     matchLabels:
       app: strimzi-access-operator
       strimzi.io/kind: access-operator
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
@@ -36,11 +38,11 @@ spec:
               mountPath: /tmp
           resources:
             limits:
-              memory: 256Mi
               cpu: 500m
-            requests:
               memory: 256Mi
+            requests:
               cpu: 100m
+              memory: 256Mi
           livenessProbe:
             httpGet:
               path: /healthy
@@ -53,5 +55,3 @@ spec:
               port: http
             initialDelaySeconds: 10
             periodSeconds: 30
-  strategy:
-    type: Recreate

systemtest/src/main/java/io/strimzi/kafka/access/TestConstants.java

@@ -13,7 +13,7 @@ public interface TestConstants {
     String USER_PATH = System.getProperty("user.dir");
 
     String INSTALL_PATH = USER_PATH + "/../packaging/install/";
-    String HELM_CHARTS_PATH = USER_PATH + "/../packaging/helm-charts/helm3/kafka-access-operator";
+    String HELM_CHARTS_PATH = USER_PATH + "/../packaging/helm-charts/helm3/strimzi-access-operator";
 
     //--------------------------
     // Strimzi related constants