Updated values for v1.4.1 (#3)

* Updated values for v1.4.1 * Increased timeout for install test * Updating Helm actions to v1.0.0
datastax · Sep 10, 2020 · 86591bd · 86591bd
1 parent 6b9d300
commit 86591bd
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 23 deletions.
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
@@ -22,19 +22,23 @@ jobs:
 
       - name: Run chart-testing (lint)
         id: lint
-        uses: helm/chart-testing-action@v1.0.0-rc.1
+        uses: helm/chart-testing-action@v1.0.0
         with:
           command: lint
+          config: ct-master.yaml
 
-      - name: Create kind cluster
-        uses: helm/kind-action@v1.0.0-alpha.3
-        # Only build a kind cluster if there are chart changes to test.
-        # if: steps.lint.outputs.changed == 'true'
+      - name: actions-k3s
+        uses: debianmaster/actions-k3s@v1.0.0
+        id: k3s
+        with:
+          version: v1.18.2-k3s1
 
       - name: Run chart-testing (install)
-        uses: helm/chart-testing-action@v1.0.0-rc.1
+        uses: helm/chart-testing-action@v1.0.0
         with:
-          command: install --config=ct-master.yaml
+          command: install
+          config: ct-master.yaml
+          kubeconfig: ${{ steps.k3s.outputs.kubeconfig }}
 
   release:
     needs: lint-test

diff --git a/.github/workflows/non-master.yaml b/.github/workflows/non-master.yaml
@@ -25,16 +25,20 @@ jobs:
 
       - name: Run chart-testing (lint)
         id: lint
-        uses: helm/chart-testing-action@v1.0.0-rc.1
+        uses: helm/chart-testing-action@v1.0.0
         with:
           command: lint
+          config: ct-master.yaml
 
-      - name: Create kind cluster
-        uses: helm/kind-action@v1.0.0-alpha.3
-        # Only build a kind cluster if there are chart changes to test.
-        if: steps.lint.outputs.changed == 'true'
+      - name: actions-k3s
+        uses: debianmaster/actions-k3s@v1.0.0
+        id: k3s
+        with:
+          version: v1.18.2-k3s1
 
       - name: Run chart-testing (install)
-        uses: helm/chart-testing-action@v1.0.0-rc.1
+        uses: helm/chart-testing-action@v1.0.0
         with:
-          command: install
+          command: install
+          config: ct-master.yaml
+          kubeconfig: ${{ steps.k3s.outputs.kubeconfig }}
diff --git a/charts/cass-operator/Chart.yaml b/charts/cass-operator/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: cass-operator
-version: 1.4.0
+version: 1.4.1
 description: Helm chart for Cass Operator.
-appVersion: 1.4.0
+appVersion: 1.4.1
 home: https://github.com/datastax/cass-operator
 maintainers:
   - name: Cassandra Operator Team

diff --git a/charts/cass-operator/templates/clusterrole.yaml b/charts/cass-operator/templates/clusterrole.yaml
@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ .Values.clusterRoleName }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
diff --git a/charts/cass-operator/templates/clusterrolebinding.yaml b/charts/cass-operator/templates/clusterrolebinding.yaml
@@ -0,0 +1,12 @@
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ .Values.clusterRoleBindingName }}
+subjects:
+- kind: ServiceAccount
+  name: {{ .Values.serviceAccountName }}
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: {{ .Values.clusterRoleName }}
+  apiGroup: rbac.authorization.k8s.io
diff --git a/charts/cass-operator/templates/customresourcedefinition.yaml b/charts/cass-operator/templates/customresourcedefinition.yaml
@@ -6037,6 +6037,7 @@ spec:
               - 6.8.0
               - 6.8.1
               - 6.8.2
+              - 6.8.3
               - 3.11.6
               - 3.11.7
               - 4.0.0

diff --git a/charts/cass-operator/templates/deployment.yaml b/charts/cass-operator/templates/deployment.yaml
@@ -55,6 +55,10 @@ spec:
           timeoutSeconds: 5
           failureThreshold: 1
         env:
+        {{- if .Values.vmwarePSPEnabled }}
+        - name: ENABLE_VMWARE_PSP
+          value: "true"
+        {{- end }}
         {{- if .Values.clusterWideInstall }}
         - name: WATCH_NAMESPACE
           value: ""

diff --git a/charts/cass-operator/values.yaml b/charts/cass-operator/values.yaml
@@ -1,11 +1,13 @@
 # Default values
 clusterWideInstall: false
 serviceAccountName: cass-operator
+clusterRoleName: cass-operator-cr
+clusterRoleBindingName: cass-operator-crb
 roleName: cass-operator
 roleBindingName: cass-operator
 webhookClusterRoleName: cass-operator-webhook
 webhookClusterRoleBindingName: cass-operator-webhook
 deploymentName: cass-operator
 deploymentReplicas: 1
-image: "datastax/cass-operator:1.4.0"
+image: "datastax/cass-operator:1.4.1"
 imagePullPolicy: IfNotPresent
diff --git a/ct-master.yaml b/ct-master.yaml
@@ -2,8 +2,7 @@
 remote: origin
 chart-dirs:
   - charts
-chart-repos:
-  - bitnami=https://charts.bitnami.com/bitnami
-helm-extra-args: --timeout 200s
+chart-repos: []
+helm-extra-args: --timeout 600s
 check-version-increment: true
 validate-maintainers: false
diff --git a/ct.yaml b/ct.yaml
@@ -2,8 +2,7 @@
 remote: origin
 chart-dirs:
   - charts
-chart-repos:
-  - bitnami=https://charts.bitnami.com/bitnami
-helm-extra-args: --timeout 200s
+chart-repos: []
+helm-extra-args: --timeout 600s
 check-version-increment: false
 validate-maintainers: false
-Original file line number
+Diff line change
@@ Expand Up / @@ -6037,6 +6037,7 @@ spec: @@
                   - 6.8.0
                   - 6.8.1
                   - 6.8.2
+                  - 6.8.3
                   - 3.11.6
                   - 3.11.7
                   - 4.0.0
@@ Expand Down @@