From e8dfd514e4fc302320e83a36dc4925b96766c37f Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Tue, 18 Jan 2022 10:10:53 +0000 Subject: [PATCH 1/2] Generated commit to update templated files based on rev 7e17cc7 in stackabletech/operator-templating repo. Original commit message: Deployment is a true jinja now (#52) --- deploy/helm/kafka-operator/Chart.yaml | 9 +++++++-- deploy/helm/kafka-operator/templates/deployment.yaml | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/deploy/helm/kafka-operator/Chart.yaml b/deploy/helm/kafka-operator/Chart.yaml index 8a8ff195..609849ff 100644 --- a/deploy/helm/kafka-operator/Chart.yaml +++ b/deploy/helm/kafka-operator/Chart.yaml @@ -2,9 +2,11 @@ # This file is automatically generated from the templates in stackabletech/operator-templating # DON'T MANUALLY EDIT THIS FILE # ============= + apiVersion: v2 name: kafka-operator description: The Stackable Operator for Apache Kafka + # A chart can be either an 'application' or a 'library' chart. # # Application charts are a collection of templates that can be packaged into versioned archives @@ -14,15 +16,18 @@ description: The Stackable Operator for Apache Kafka # a dependency of application charts to inject those utilities and functions into the rendering # pipeline. Library charts do not define any templates and therefore cannot be deployed. type: application + maintainers: - name: stackable url: github.com/stackabletech + # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.0-nightly +version: + # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.5.0-nightly +appVersion: diff --git a/deploy/helm/kafka-operator/templates/deployment.yaml b/deploy/helm/kafka-operator/templates/deployment.yaml index ff825661..5ca8274a 100644 --- a/deploy/helm/kafka-operator/templates/deployment.yaml +++ b/deploy/helm/kafka-operator/templates/deployment.yaml @@ -43,6 +43,9 @@ spec: volumeMounts: - mountPath: /etc/stackable/{{ include "operator.appname" . }}/config-spec name: config-spec + env: + - name: KAFKA_BROKER_CLUSTERROLE + value: {{ .Release.Name }}-kafka-broker-clusterrole volumes: - name: config-spec configMap: From e8bfac79fadf0439fbb7203c691dd8b0bc3d78a3 Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Tue, 18 Jan 2022 10:11:55 +0000 Subject: [PATCH 2/2] Github Actions: Generated k8s manifest files --- deploy/helm/kafka-operator/Chart.yaml | 9 ++------- deploy/manifests/deployment.yaml | 3 +++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/deploy/helm/kafka-operator/Chart.yaml b/deploy/helm/kafka-operator/Chart.yaml index 609849ff..8a8ff195 100644 --- a/deploy/helm/kafka-operator/Chart.yaml +++ b/deploy/helm/kafka-operator/Chart.yaml @@ -2,11 +2,9 @@ # This file is automatically generated from the templates in stackabletech/operator-templating # DON'T MANUALLY EDIT THIS FILE # ============= - apiVersion: v2 name: kafka-operator description: The Stackable Operator for Apache Kafka - # A chart can be either an 'application' or a 'library' chart. # # Application charts are a collection of templates that can be packaged into versioned archives @@ -16,18 +14,15 @@ description: The Stackable Operator for Apache Kafka # a dependency of application charts to inject those utilities and functions into the rendering # pipeline. Library charts do not define any templates and therefore cannot be deployed. type: application - maintainers: - name: stackable url: github.com/stackabletech - # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: - +version: 0.5.0-nightly # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: +appVersion: 0.5.0-nightly diff --git a/deploy/manifests/deployment.yaml b/deploy/manifests/deployment.yaml index 23902e95..f186e0ee 100644 --- a/deploy/manifests/deployment.yaml +++ b/deploy/manifests/deployment.yaml @@ -36,6 +36,9 @@ spec: volumeMounts: - mountPath: /etc/stackable/kafka-operator/config-spec name: config-spec + env: + - name: KAFKA_BROKER_CLUSTERROLE + value: kafka-operator-kafka-broker-clusterrole volumes: - name: config-spec configMap: