Merge branch 'main' into ae/console/testing

redpanda-data · Aug 16, 2023 · fb5f531 · fb5f531
2 parents 6165138 + 08a901d
commit fb5f531
Show file tree

Hide file tree

Showing 18 changed files with 81 additions and 53 deletions.
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -85,7 +85,7 @@ jobs:
           version: v3.8.0-1
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.5.0
+        uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0
         with:
           config: .github/kind.yaml
 

diff --git a/.github/workflows/nightly_redpanda_tip.yaml b/.github/workflows/nightly_redpanda_tip.yaml
@@ -70,7 +70,7 @@ jobs:
           version: v3.8.0-1
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.5.0
+        uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0
         with:
           config: .github/kind.yaml
 

diff --git a/.github/workflows/pull_requests_connectors.yaml b/.github/workflows/pull_requests_connectors.yaml
@@ -105,7 +105,7 @@ jobs:
           fi
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.5.0
+        uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
           config: .github/kind.yaml

diff --git a/.github/workflows/pull_requests_from_origin.yaml b/.github/workflows/pull_requests_from_origin.yaml
@@ -77,7 +77,7 @@ jobs:
           bash -O extglob -c "rm -v charts/redpanda/ci/!(${{ matrix.testvaluespattern }})"
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.5.0
+        uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
           config: .github/kind.yaml

diff --git a/.github/workflows/pull_requests_kminion.yaml b/.github/workflows/pull_requests_kminion.yaml
@@ -105,7 +105,7 @@ jobs:
           fi
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.5.0
+        uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
           config: .github/kind.yaml

diff --git a/.github/workflows/pull_requests_operator.yaml b/.github/workflows/pull_requests_operator.yaml
@@ -107,7 +107,7 @@ jobs:
           fi
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.5.0
+        uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
           config: .github/kind.yaml

diff --git a/.github/workflows/pull_requests_redpanda.yaml b/.github/workflows/pull_requests_redpanda.yaml
@@ -128,7 +128,7 @@ jobs:
           bash -O extglob -c "rm -v charts/redpanda/ci/!(${{ matrix.testvaluespattern }})"
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.5.0
+        uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
           config: .github/kind.yaml

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -30,12 +30,12 @@ jobs:
       contents: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5
         with:
           version: v3.11.1
 
@@ -49,9 +49,45 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.4.1
-        with:
-          charts_repo_url: https://charts.redpanda.com
+        uses: helm/chart-releaser-action@be16258da8010256c6e82849661221415f031968 # v1.5.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CR_SKIP_EXISTING: true
+
+      - name: Checkout kustomize
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        with:
+          ref: kustomize
+          path: kustomize
+
+      - name: Configure Git for gh-pages
+        run: |
+          git -C kustomize config user.name "$GITHUB_ACTOR"
+          git -C kustomize config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
+
+      - name: Install kustomize
+        uses: imranismail/setup-kustomize@6691bdeb1b0a3286fb7f70fd1423c10e81e5375f # v2.0.0
+        with:
+          kustomize-version: v5.1.1
+
+      - name: Build dependencies for the operator chart
+        run: |
+          mkdir -p kustomize/operator
+          helm repo add prometheus https://prometheus-community.github.io/helm-charts
+          helm dependency build charts/operator
+
+      - name: Template the operator chart
+        run: |
+          helm template -n redpanda operator charts/operator --no-hooks > kustomize/operator/resources.yaml
+
+      - name: Build kustomization for operator
+        run: |
+          cd kustomize/operator
+          kustomize create --resources resources.yaml
+          cd ..
+          if [[ $(git status --porcelain) ]] ; then
+            git add .
+            git commit -m 'update kustomize/operator'
+            git push
+          fi
diff --git a/charts/kminion/Chart.yaml b/charts/kminion/Chart.yaml
@@ -20,27 +20,16 @@ maintainers:
   - name: redpanda-data
     url: https://github.com/orgs/redpanda-data/people
 
-
-# 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
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# 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
 
-# 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.12.2
+# The chart version and the app version are not the same and will not track
+# together. The chart version is a semver representation of changes to this
+# chart.
+version: 0.12.3
 
-# 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: "v2.2.5"
+# The app version is the default version of Redpanda to install.
+# ** NOTE for maintainers: please ensure the artifacthub image annotation is updated before merging
+appVersion: v2.2.5
 
 icon: https://images.ctfassets.net/paqvtpyf8rwu/3cYHw5UzhXCbKuR24GDFGO/73fb682e6157d11c10d5b2b5da1d5af0/skate-stand-panda.svg
 sources:
@@ -53,5 +42,5 @@ annotations:
     - name: "Helm (>= 3.6.0)"
       url: https://helm.sh/docs/intro/install/
   artifacthub.io/images: |
-    - name: redpanda
+    - name: kminion
       image: docker.redpanda.com/redpandadata/kminion:v2.2.5
diff --git a/charts/kminion/templates/daemonset.yaml b/charts/kminion/templates/daemonset.yaml
@@ -46,7 +46,7 @@ spec:
       {{- end}}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8}}
-      serviceAccountName: {{ .Values.serviceAccount.name }}
+      serviceAccountName: {{ include "kminion.serviceAccountName" . }}
       volumes:
         - name: config
           configMap:

diff --git a/charts/operator/Chart.yaml b/charts/operator/Chart.yaml
@@ -3,20 +3,21 @@ name: operator
 description: Redpanda operator helm chart
 type: application
 
-# This is the chart version. This is only placeholder that will be set during release process
-version: 0.3.10
+# The chart version and the app version are not the same and will not track
+# together. The chart version is a semver representation of changes to this
+# chart.
+version: 0.3.11
 
-# This is the version number of the application being deployed. This is only placeholder that
-# will be set during release process.
-appVersion: v23.2.4
+# This is the default version of the operator being deployed.
+# ** NOTE for maintainers: please ensure the artifacthub image annotation is updated before merging
+appVersion: v23.2.5
 
-home: https://vectorized.io
 sources:
   - https://github.com/redpanda-data/helm-charts
 icon: https://go.redpanda.com/hubfs/Redpandas/operator-panda.png
 maintainers:
-  - name: Vectorizedio
-    email: support@vectorized.io
+  - name: redpanda-data
+    url: https://github.com/orgs/redpanda-data/people
 
 dependencies:
 - name: kube-prometheus-stack
@@ -33,9 +34,9 @@ annotations:
       url: https://helm.sh/docs/intro/install/
   artifacthub.io/images: |
     - name: redpanda-operator
-      image: docker.redpanda.com/redpandadata/redpanda-operator:v23.2.2
+      image: docker.redpanda.com/redpandadata/redpanda-operator:v23.2.5
     - name: redpanda
-      image: docker.redpanda.com/redpandadata/redpanda:v23.2.2
+      image: docker.redpanda.com/redpandadata/redpanda:v23.2.5
     - name: kube-rbac-proxy
       image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
   artifacthub.io/crds: |
@@ -45,4 +46,4 @@ annotations:
       displayName: Redpanda
       description: Define a Redpanda cluster
   artifacthub.io/operator: "true"
-  artifacthub.io/operatorCapabilities: Basic Install
+  artifacthub.io/operatorCapabilities: Seamless Upgrades
diff --git a/charts/operator/templates/clusterrole_binding.yaml b/charts/operator/templates/clusterrole_binding.yaml
@@ -22,6 +22,6 @@ roleRef:
   name: {{ include "redpanda-operator.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: {{ template "redpanda-operator.serviceAccountName" . }}
+  name: {{ include "redpanda-operator.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 {{- end -}}
diff --git a/charts/operator/templates/clusterrole_proxy_binding.yaml b/charts/operator/templates/clusterrole_proxy_binding.yaml
@@ -22,6 +22,6 @@ roleRef:
   name: {{ include "redpanda-operator.fullname" . }}-proxy-role
 subjects:
 - kind: ServiceAccount
-  name: {{ template "redpanda-operator.serviceAccountName" . }}
+  name: {{ include "redpanda-operator.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 {{- end -}}
diff --git a/charts/operator/templates/extra_role.yaml b/charts/operator/templates/extra_role.yaml
@@ -41,6 +41,6 @@ roleRef:
   name: {{ include "redpanda-operator.fullname" . }}-pvc
 subjects:
   - kind: ServiceAccount
-    name: {{ template "redpanda-operator.serviceAccountName" . }}
+    name: {{ include "redpanda-operator.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
-{{ end }}
+{{ end }}
diff --git a/charts/operator/templates/role_binding.yaml b/charts/operator/templates/role_binding.yaml
@@ -38,7 +38,7 @@ roleRef:
   name: {{ include "redpanda-operator.fullname" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ template "redpanda-operator.serviceAccountName" . }}
+    name: {{ include "redpanda-operator.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
   {{- end }}
 {{- end -}}
diff --git a/charts/operator/templates/service_account.yaml b/charts/operator/templates/service_account.yaml
@@ -13,7 +13,7 @@ by the Apache License, Version 2.0
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ template "redpanda-operator.serviceAccountName" . }}
+  name: {{ include "redpanda-operator.serviceAccountName" . }}
   labels:
 {{ include "redpanda-operator.labels" . | indent 4 }}
 {{- end -}}
diff --git a/charts/operator/templates/tests/create-topic-with-client-auth.yaml b/charts/operator/templates/tests/create-topic-with-client-auth.yaml
@@ -16,7 +16,7 @@ metadata:
     helm.sh/hook-delete-policy: before-hook-creation
     helm.sh/hook-weight: "2"
 spec:
-  serviceAccount: {{ include "redpanda-operator.fullname" . }}
+  serviceAccount: {{ include "redpanda-operator.serviceAccountName" . }}
   containers:
     - name: rpk
       image: docker.redpanda.com/redpandadata/redpanda:latest

diff --git a/charts/redpanda/Chart.yaml b/charts/redpanda/Chart.yaml
@@ -23,10 +23,12 @@ type: application
 # The chart version and the app version are not the same and will not track
 # together. The chart version is a semver representation of changes to this
 # chart.
-version: 5.1.2
+version: 5.1.3
 
 # The app version is the default version of Redpanda to install.
-appVersion: v23.2.4
+# ** NOTE for maintainers: please ensure the artifacthub image annotation is updated before merging
+appVersion: v23.2.5
+
 # kubeVersion must be suffixed with "-0" to be able to match cloud providers
 # kubernetes versions like "v1.23.8-gke.1900". Their suffix is interpreted as a
 # pre-release. Our "-0" allows pre-releases to be matched.
@@ -54,7 +56,7 @@ annotations:
       url: https://helm.sh/docs/intro/install/
   artifacthub.io/images: |
     - name: redpanda
-      image: docker.redpanda.com/redpandadata/redpanda:v23.2.2
+      image: docker.redpanda.com/redpandadata/redpanda:v23.2.5
     - name: busybox
       image: busybox:latest
     - name: mintel/docker-alpine-bash-curl-jq