Adjustments to CRD templating in Helm (#296)

* Updated CRD in Helm chart to be static instead of templated Updated KIND k8s versions in release scripts - Removed < v1.15 - Added v1.19 * Update messaging regarding minimum version 1.15 * Updated k8s version in docs directory * Regenerated manifests with new k8s versions
datastax · Oct 23, 2020 · a757549 · a757549
1 parent 00c02be
commit a757549
Show file tree

Hide file tree

Showing 15 changed files with 419 additions and 38,301 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ kubectl -n cass-operator create -f https://raw.githubusercontent.com/datastax/ca
 
 ### Loading the operator
 
-Installing the Cass Operator itself is straightforward. We have provided manifests for each Kubernetes version from 1.13 through 1.17. Apply the relevant manifest to your cluster as follows:
+Installing the Cass Operator itself is straightforward. We have provided manifests for each Kubernetes version from 1.15 through 1.19. Apply the relevant manifest to your cluster as follows:
 
 ```console
 K8S_VER=v1.16
@@ -313,7 +313,7 @@ spec:
 
 ## Requirements
 
-- Kubernetes cluster, 1.13 or newer.
+- Kubernetes cluster, 1.15 or newer.
 
 ## Contributing
 

diff --git a/...t/templates/customresourcedefinition.yaml → ...-chart/crds/customresourcedefinition.yaml b/...t/templates/customresourcedefinition.yaml → ...-chart/crds/customresourcedefinition.yaml
@@ -1378,14 +1378,6 @@ spec:
                               - containerPort
                               type: object
                             type: array
-                            {{- 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:
                             description: 'Periodic probe of container service readiness.
                               Container will be removed from service endpoints if
@@ -3714,14 +3706,6 @@ spec:
                               - containerPort
                               type: object
                             type: array
-                            {{- 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:
                             description: 'Periodic probe of container service readiness.
                               Container will be removed from service endpoints if
@@ -4652,12 +4636,6 @@ spec:
                         - whenUnsatisfiable
                         type: object
                       type: array
-                      {{- if semverCompare ">= 1.16-0" .Capabilities.KubeVersion.GitVersion }}
-                      x-kubernetes-list-map-keys:
-                      - topologyKey
-                      - whenUnsatisfiable
-                      x-kubernetes-list-type: map
-                      {{- end }}
                     volumes:
                       description: 'List of volumes that can be mounted by containers
                         belonging to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes'
@@ -6302,9 +6280,7 @@ spec:
               type: string
           type: object
       type: object
-      {{- if semverCompare ">= 1.15-0" .Capabilities.KubeVersion.GitVersion }}
       x-kubernetes-preserve-unknown-fields: true
-      {{- end }}
   version: v1beta1
   versions:
   - name: v1beta1

diff --git a/charts/cass-operator-chart/templates/validatingwebhookconfiguration.yaml b/charts/cass-operator-chart/templates/validatingwebhookconfiguration.yaml
@@ -9,20 +9,14 @@ webhooks:
     apiVersions: ["v1beta1"]
     operations: ["CREATE", "UPDATE"]
     resources: ["cassandradatacenters"]
-    {{- if semverCompare ">= 1.14-0" .Capabilities.KubeVersion.GitVersion }}
     scope: "*"
-    {{- end }}
   clientConfig:
     service:
       name: "cassandradatacenter-webhook-service"
       namespace: {{ .Release.Namespace }}
       path: /validate-cassandra-datastax-com-v1beta1-cassandradatacenter
-  {{- if semverCompare ">= 1.14-0" .Capabilities.KubeVersion.GitVersion }}
   admissionReviewVersions: ["v1beta1"]
   timeoutSeconds: 10
-  {{- end }}
   failurePolicy: "Ignore"
-  {{- if semverCompare ">= 1.15-0" .Capabilities.KubeVersion.GitVersion }}
   matchPolicy: "Equivalent"
-  {{- end }}
   sideEffects: None
diff --git a/docs/user/README.md b/docs/user/README.md
@@ -7,10 +7,8 @@ and managing Cassandra or DSE in a Kubernetes cluster.
 
 ## Prerequisites
 
-1. A Kubernetes cluster. Kubernetes v1.15 is recommended, but Kubernetes
-   v1.13 has been tested and works provided the line containing
-   `x-kubernetes-preserve-unknown-fields: true` is deleted from
-   `cass-operator-manifests.yaml`.
+1. A Kubernetes cluster. Kubernetes v1.18 is recommended, but Kubernetes
+   v1.15 has been tested.
 2. The ability to download images from Docker Hub from within the Kubernetes
    cluster.