Update cass-operator to v1.3.0 (#2)

* Update cass-operator to v1.3.0 * Added appVersion and home fields to Chart.yaml * Added maintainer to chart * Removed maintainer validation * Test fixing kind action * Add kubeconfig home directory * Add kubeconfig home directory and file * Removed maintainers check * Added duration to timeout
datastax · Jul 16, 2020 · d737624 · d737624
1 parent 5bbbeba
commit d737624
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 9 deletions.
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
@@ -15,6 +15,11 @@ jobs:
       - name: Fetch history
         run: git fetch --prune --unshallow
 
+      - name: Create Kubeconfig directories
+        run: |
+          mkdir ~/.kube
+          touch ~/.kube/config
+
       - name: Run chart-testing (lint)
         id: lint
         uses: helm/[email protected]
@@ -24,7 +29,7 @@ jobs:
       - name: Create kind cluster
         uses: helm/[email protected]
         # Only build a kind cluster if there are chart changes to test.
-        if: steps.lint.outputs.changed == 'true'
+        # if: steps.lint.outputs.changed == 'true'
 
       - name: Run chart-testing (install)
         uses: helm/[email protected]

diff --git a/.github/workflows/non-master.yaml b/.github/workflows/non-master.yaml
@@ -17,6 +17,11 @@ jobs:
 
       - name: Fetch history
         run: git fetch --prune --unshallow
+
+      - name: Create Kubeconfig directories
+        run: |
+          mkdir ~/.kube
+          touch ~/.kube/config
 
       - name: Run chart-testing (lint)
         id: lint

diff --git a/charts/cass-operator/Chart.yaml b/charts/cass-operator/Chart.yaml
@@ -1,4 +1,10 @@
 apiVersion: v2
 name: cass-operator
-version: 1.2.0
+version: 1.3.0
 description: Helm chart for Cass Operator.
+appVersion: 1.3.0
+home: https://github.com/datastax/cass-operator
+maintainers:
+  - name: Cassandra Operator Team
+    email: [email protected]
+    url: https://www.datastax.com/
diff --git a/charts/cass-operator/templates/customresourcedefinition.yaml b/charts/cass-operator/templates/customresourcedefinition.yaml
@@ -35,6 +35,10 @@ spec:
         spec:
           description: CassandraDatacenterSpec defines the desired state of a CassandraDatacenter
           properties:
+            additionalSeeds:
+              items:
+                type: string
+              type: array
             allowMultipleNodesPerWorker:
               description: Turning this option on allows multiple server pods to be
                 created on a k8s worker node. By default the operator creates just
@@ -1316,7 +1320,9 @@ spec:
                             {{- if semverCompare ">= 1.16-0" .Capabilities.KubeVersion.GitVersion }}
                             x-kubernetes-list-map-keys:
                             - containerPort
+                            {{- if semverCompare "< 1.18-0" .Capabilities.KubeVersion.GitVersion }}
                             - protocol
+                            {{- end }}
                             x-kubernetes-list-type: map
                             {{- end }}
                           readinessProbe:
@@ -3650,7 +3656,9 @@ spec:
                             {{- if semverCompare ">= 1.16-0" .Capabilities.KubeVersion.GitVersion }}
                             x-kubernetes-list-map-keys:
                             - containerPort
+                            {{- if semverCompare "< 1.18-0" .Capabilities.KubeVersion.GitVersion }}
                             - protocol
+                            {{- end }}
                             x-kubernetes-list-type: map
                             {{- end }}
                           readinessProbe:
@@ -5888,6 +5896,17 @@ spec:
                 - name
                 type: object
               type: array
+            reaper:
+              properties:
+                enabled:
+                  type: boolean
+                image:
+                  type: string
+                imagePullPolicy:
+                  description: PullPolicy describes a policy for if/when to pull a
+                    container image
+                  type: string
+              type: object
             replaceNodes:
               description: A list of pod names that need to be replaced.
               items:
@@ -5937,6 +5956,7 @@ spec:
                 server configuration
               enum:
               - 6.8.0
+              - 6.8.1
               - 3.11.6
               - 4.0.0
               type: string
@@ -6086,6 +6106,19 @@ spec:
               description: This secret defines the username and password for the Cassandra
                 server superuser. If it is omitted, we will generate a secret instead.
               type: string
+            users:
+              description: Cassandra users to bootstrap
+              items:
+                properties:
+                  secretName:
+                    type: string
+                  superuser:
+                    type: boolean
+                required:
+                - secretName
+                - superuser
+                type: object
+              type: array
           required:
           - clusterName
           - serverType
@@ -6131,13 +6164,17 @@ spec:
                 properties:
                   hostID:
                     type: string
-                  nodeIP:
-                    type: string
                 type: object
               type: object
             superUserUpserted:
-              description: The timestamp at which CQL superuser credentials were last
-                upserted to the management API
+              description: Deprecated. Use usersUpserted instead. The timestamp at
+                which CQL superuser credentials were last upserted to the management
+                API
+              format: date-time
+              type: string
+            usersUpserted:
+              description: The timestamp at which managed cassandra users' credentials
+                were last upserted to the management API
               format: date-time
               type: string
           type: object

diff --git a/charts/cass-operator/templates/role.yaml b/charts/cass-operator/templates/role.yaml
@@ -63,3 +63,9 @@ rules:
   - '*'
   verbs:
   - '*'
+- apiGroups:
+    - batch
+  resources:
+    - '*'
+  verbs:
+    - '*'
diff --git a/charts/cass-operator/values.yaml b/charts/cass-operator/values.yaml
@@ -6,5 +6,5 @@ roleName: cass-operator
 roleBindingName: cass-operator
 deploymentName: cass-operator
 deploymentReplicas: 1
-image: "datastax/cass-operator:1.2.0"
+image: "datastax/cass-operator:1.3.0"
 imagePullPolicy: IfNotPresent
diff --git a/ct-master.yaml b/ct-master.yaml
@@ -4,5 +4,6 @@ chart-dirs:
   - charts
 chart-repos:
   - bitnami=https://charts.bitnami.com/bitnami
-helm-extra-args: --timeout 200
+helm-extra-args: --timeout 200s
 check-version-increment: true
+validate-maintainers: false
diff --git a/ct.yaml b/ct.yaml
@@ -4,5 +4,6 @@ chart-dirs:
   - charts
 chart-repos:
   - bitnami=https://charts.bitnami.com/bitnami
-helm-extra-args: --timeout 200
+helm-extra-args: --timeout 200s
 check-version-increment: false
+validate-maintainers: false
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,3 +63,9 @@ rules: @@
       - '*'
       verbs:
       - '*'
+    - apiGroups:
+        - batch
+      resources:
+        - '*'
+      verbs:
+        - '*'