Update manifests to 1.7.0 supported form, remove per-kubernetes-ones

README.md

@@ -1,7 +1,7 @@
 # Cass Operator
 [![License: Apache License 2.0](https://img.shields.io/github/license/k8ssandra/cass-operator)](https://github.com/k8ssandra/cass-operator/blob/master/LICENSE.txt)
 
-The k8ssandra Kubernetes Operator for Apache Cassandra®. This repository replaces the old [datastax/cass-operator](https://github.com/datastax/cass-operator) for use-cases in the k8ssandra project. Some documentation is still out of date and will be modified in the future. Check [k8ssandra/k8ssandra](https://github.com/k8ssandra/k8ssandra) for more up to date information.
+The K8ssandra Kubernetes Operator for Apache Cassandra®. This repository replaces the old [datastax/cass-operator](https://github.com/datastax/cass-operator) for use-cases in the k8ssandra project. Some documentation is still out of date and will be modified in the future. Check [k8ssandra/k8ssandra](https://github.com/k8ssandra/k8ssandra) for more up to date information.
 
 ## Getting Started
 
@@ -158,6 +158,15 @@ cluster1-superuser@cqlsh> select * from system.peers;
 
 To install a cluster with optional integrated backup/restore and repair utilities, check the [k8ssandra/k8ssandra](https://github.com/k8ssandra/k8ssandra) helm charts project. 
 
+If you wish to install only the cass-operator, you can run the following command:
+
+```
+helm repo add k8ssandra https://helm.k8ssandra.io/stable
+helm install k8ssandra k8ssandra/k8ssandra --set cassandra.enabled=false --set reaper.enabled=false --set reaper-operator.enabled=false --set stargate.enabled=false --set kube-prometheus-stack.enabled=false
+```
+
+You can then apply your CassandraDatacenter.
+
 ##### Custom Docker registry example: Github packages
 
 Github Packages may be used as a custom Docker registry.

charts/cass-operator-chart/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
 name: cass-operator
-version: 1.6.0
+version: 1.7.0
 description: Helm chart for Cass Operator.
-appVersion: 1.6.0
-home: https://github.com/datastax/cass-operator
+appVersion: 1.7.0
+home: https://github.com/k8ssandra/cass-operator
 maintainers:
   - name: Cassandra Operator Team
     email: [email protected]

charts/cass-operator-chart/values.yaml

@@ -9,6 +9,6 @@ webhookClusterRoleName: cass-operator-webhook
 webhookClusterRoleBindingName: cass-operator-webhook
 deploymentName: cass-operator
 deploymentReplicas: 1
-defaultImage: "datastax/cass-operator:1.6.0"
+defaultImage: "k8ssandra/cass-operator:1.7.0"
 imagePullPolicy: IfNotPresent
 imagePullSecret: ""

docs/user/cass-operator-manifests-v1.15.yaml → docs/user/cass-operator-manifests.yaml

@@ -60,6 +60,79 @@ spec:
               items:
                 type: string
               type: array
+            additionalServiceConfig:
+              description: AdditionalServiceConfig allows to define additional parameters
+                that are included in the created Services. Note, user can override
+                values set by cass-operator and doing so could break cass-operator
+                functionality. Avoid label "cass-operator" and anything that starts
+                with "cassandra.datastax.com/"
+              properties:
+                additionalSeedService:
+                  description: ServiceConfigAdditions exposes additional options for
+                    each service
+                  properties:
+                    additionalAnnotations:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    additionalLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
+                  type: object
+                allpodsService:
+                  description: ServiceConfigAdditions exposes additional options for
+                    each service
+                  properties:
+                    additionalAnnotations:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    additionalLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
+                  type: object
+                dcService:
+                  description: ServiceConfigAdditions exposes additional options for
+                    each service
+                  properties:
+                    additionalAnnotations:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    additionalLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
+                  type: object
+                nodePortService:
+                  description: ServiceConfigAdditions exposes additional options for
+                    each service
+                  properties:
+                    additionalAnnotations:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    additionalLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
+                  type: object
+                seedService:
+                  description: ServiceConfigAdditions exposes additional options for
+                    each service
+                  properties:
+                    additionalAnnotations:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    additionalLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
+                  type: object
+              type: object
             allowMultipleNodesPerWorker:
               description: Turning this option on allows multiple server pods to be
                 created on a k8s worker node. By default the operator creates just
@@ -112,6 +185,17 @@ spec:
                     value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                   type: object
               type: object
+            configSecret:
+              description: "ConfigSecret is the name of a secret that contains configuration
+                for Cassandra. The secret is expected to have a property named config
+                whose value should be a JSON formatted string that should look like
+                this: \n    config: |-      {        \"cassandra-yaml\": {          \"read_request_timeout_in_ms\":
+                10000        },        \"jmv-options\": {          \"max_heap_size\":
+                1024M        }      } \n ConfigSecret is mutually exclusive with Config.
+                ConfigSecret takes precedence and will be used exclusively if both
+                properties are set. The operator sets a watch such that an update
+                to the secret will trigger an update of the StatefulSets."
+              type: string
             disableSystemLoggerSidecar:
               description: Configuration for disabling the simple log tailing sidecar
                 container. Our default is to have it enabled.
@@ -5972,6 +6056,12 @@ spec:
                 type: object
               type: array
             reaper:
+              description: 'Deprecated: Reaper''s sidecar mode has too many problems
+                in Kubernetes for it to usable. In order for it to work reliably,
+                changes in Reaper would be needed. See https://github.com/thelastpickle/cassandra-reaper/issues/956
+                for details. Because those changes were not implemented in Reaper
+                and because Reaper support was instead added through k8ssandra, this
+                field will be removed in the 1.8.0 release.'
               properties:
                 enabled:
                   type: boolean
@@ -6376,6 +6466,47 @@ spec:
                     value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                   type: object
               type: object
+            tolerations:
+              description: Tolerations applied to the Cassandra pod. Note that these
+                cannot be overridden with PodTemplateSpec.
+              items:
+                description: The pod this Toleration is attached to tolerates any
+                  taint that matches the triple <key,value,effect> using the matching
+                  operator <operator>.
+                properties:
+                  effect:
+                    description: Effect indicates the taint effect to match. Empty
+                      means match all taint effects. When specified, allowed values
+                      are NoSchedule, PreferNoSchedule and NoExecute.
+                    type: string
+                  key:
+                    description: Key is the taint key that the toleration applies
+                      to. Empty means match all taint keys. If the key is empty, operator
+                      must be Exists; this combination means to match all values and
+                      all keys.
+                    type: string
+                  operator:
+                    description: Operator represents a key's relationship to the value.
+                      Valid operators are Exists and Equal. Defaults to Equal. Exists
+                      is equivalent to wildcard for value, so that a pod can tolerate
+                      all taints of a particular category.
+                    type: string
+                  tolerationSeconds:
+                    description: TolerationSeconds represents the period of time the
+                      toleration (which must be of effect NoExecute, otherwise this
+                      field is ignored) tolerates the taint. By default, it is not
+                      set, which means tolerate the taint forever (do not evict).
+                      Zero and negative values will be treated as 0 (evict immediately)
+                      by the system.
+                    format: int64
+                    type: integer
+                  value:
+                    description: Value is the taint value the toleration matches to.
+                      If the operator is Exists, the value should be empty, otherwise
+                      just a regular string.
+                    type: string
+                type: object
+              type: array
             users:
               description: Cassandra users to bootstrap
               items:
@@ -6655,7 +6786,7 @@ spec:
           value: cass-operator
         - name: SKIP_VALIDATING_WEBHOOK
           value: "FALSE"
-        image: datastax/cass-operator:1.6.0
+        image: k8ssandra/cass-operator:1.7.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:

hack/release/make-yaml-bundle.sh

@@ -10,7 +10,7 @@ bundle="$(mktemp)"
 k8sVer="$(kubectl version --short | grep Server | egrep -o 'v[0-9].[0-9]+')"
 
 echo '---' >> "$bundle"
-cat operator/deploy/namespace.yaml | yq r - >> "$bundle"
+cat operator/deploy/namespace.yaml | yq eval - >> "$bundle"
 
 echo '---' >> "$bundle"
 helm template ./charts/cass-operator-chart/ -n cass-operator --validate=true | kubectl create --dry-run=client -o yaml -n cass-operator -f - >> "$bundle"

operator/deploy/operator.yaml

@@ -23,7 +23,7 @@ spec:
           secretName: cass-operator-webhook-config
       containers:
       - name: cass-operator
-        image: datastax/cass-operator:latest
+        image: k8ssandra/cass-operator:latest
         imagePullPolicy: IfNotPresent
         volumeMounts:
         - mountPath: /tmp/k8s-webhook-server/serving-certs