cspl-1175: Increment the CRD version to v2 (#417)

- As part of supporting the App Framework spec changes, increment the CRD version to v2. - Increment Splunk Operator version to 1.0.2
splunk · Jul 15, 2021 · 45e192b · 45e192b
1 parent 652686e
commit 45e192b
Show file tree

Hide file tree

Showing 83 changed files with 16,304 additions and 1,768 deletions.
diff --git a/build/make_bundle.sh b/build/make_bundle.sh
@@ -5,7 +5,7 @@
 set -e
 
 VERSION=`grep "Version.*=.*\".*\"" version/version.go | sed "s,.*Version.*=.*\"\(.*\)\".*,\1,"`
-OLD_VERSIONS="v1beta1 v1alpha3 v1alpha2"
+OLD_VERSIONS="v1 v1beta1 v1alpha3 v1alpha2"
 DOCKER_IO_PATH="docker.io/splunk"
 REDHAT_REGISTRY_PATH="registry.connect.redhat.com/splunk"
 OPERATOR_IMAGE="$DOCKER_IO_PATH/splunk-operator:${VERSION}"
@@ -90,7 +90,7 @@ cat << EOF >$YAML_SCRIPT_FILE
   path: metadata.annotations.alm-examples
   value: |-
     [{
-      "apiVersion": "enterprise.splunk.com/v1",
+      "apiVersion": "enterprise.splunk.com/v2",
       "kind": "IndexerCluster",
       "metadata": {
         "name": "example",
@@ -101,7 +101,7 @@ cat << EOF >$YAML_SCRIPT_FILE
       }
     },
     {
-      "apiVersion": "enterprise.splunk.com/v1",
+      "apiVersion": "enterprise.splunk.com/v2",
       "kind": "LicenseMaster",
       "metadata": {
         "name": "example",
@@ -110,7 +110,7 @@ cat << EOF >$YAML_SCRIPT_FILE
       "spec": {}
     },
     {
-      "apiVersion": "enterprise.splunk.com/v1",
+      "apiVersion": "enterprise.splunk.com/v2",
       "kind": "SearchHeadCluster",
       "metadata": {
         "name": "example",
@@ -121,7 +121,7 @@ cat << EOF >$YAML_SCRIPT_FILE
       }
     },
     {
-      "apiVersion": "enterprise.splunk.com/v1",
+      "apiVersion": "enterprise.splunk.com/v2",
       "kind": "Standalone",
       "metadata": {
         "name": "example",

diff --git a/deploy/crds/enterprise.splunk.com_clustermasters_crd.yaml b/deploy/crds/enterprise.splunk.com_clustermasters_crd.yaml
@@ -18,7 +18,7 @@ spec:
       jsonPath: .status.phase
       name: Phase
       type: string
-    name: v1
+    name: v2
     schema:
       openAPIV3Schema:
         description: ClusterMaster is the Schema for the clustermasters API
@@ -1141,7 +1141,6 @@ spec:
                               x-kubernetes-int-or-string: true
                           required:
                           - port
-                          - protocol
                           type: object
                         type: array
                         x-kubernetes-list-map-keys:
@@ -2912,6 +2911,15 @@ spec:
     storage: true
     subresources:
       status: {}
+  - name: v1
+    served: true
+    storage: false
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          apiVersion:
+            type: string
   - name: v1beta1
     served: true
     storage: false

diff --git a/deploy/crds/enterprise.splunk.com_indexerclusters_crd.yaml b/deploy/crds/enterprise.splunk.com_indexerclusters_crd.yaml
@@ -35,7 +35,7 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v1
+    name: v2
     schema:
       openAPIV3Schema:
         description: IndexerCluster is the Schema for a Splunk Enterprise indexer
@@ -1087,7 +1087,6 @@ spec:
                               x-kubernetes-int-or-string: true
                           required:
                           - port
-                          - protocol
                           type: object
                         type: array
                         x-kubernetes-list-map-keys:
@@ -2569,6 +2568,15 @@ spec:
         specReplicasPath: .spec.replicas
         statusReplicasPath: .status.replicas
       status: {}
+  - name: v1
+    served: true
+    storage: false
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          apiVersion:
+            type: string
   - name: v1beta1
     served: true
     storage: false

diff --git a/deploy/crds/enterprise.splunk.com_licensemasters_crd.yaml b/deploy/crds/enterprise.splunk.com_licensemasters_crd.yaml
@@ -22,7 +22,7 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v1
+    name: v2
     schema:
       openAPIV3Schema:
         description: LicenseMaster is the Schema for a Splunk Enterprise license master.
@@ -1146,7 +1146,6 @@ spec:
                               x-kubernetes-int-or-string: true
                           required:
                           - port
-                          - protocol
                           type: object
                         type: array
                         x-kubernetes-list-map-keys:
@@ -2681,6 +2680,15 @@ spec:
     storage: true
     subresources:
       status: {}
+  - name: v1
+    served: true
+    storage: false
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          apiVersion:
+            type: string
   - name: v1beta1
     served: true
     storage: false

diff --git a/deploy/crds/enterprise.splunk.com_searchheadclusters_crd.yaml b/deploy/crds/enterprise.splunk.com_searchheadclusters_crd.yaml
@@ -34,7 +34,7 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v1
+    name: v2
     schema:
       openAPIV3Schema:
         description: SearchHeadCluster is the Schema for a Splunk Enterprise search
@@ -1164,7 +1164,6 @@ spec:
                               x-kubernetes-int-or-string: true
                           required:
                           - port
-                          - protocol
                           type: object
                         type: array
                         x-kubernetes-list-map-keys:
@@ -2790,6 +2789,15 @@ spec:
         specReplicasPath: .spec.replicas
         statusReplicasPath: .status.replicas
       status: {}
+  - name: v1
+    served: true
+    storage: false
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          apiVersion:
+            type: string
   - name: v1beta1
     served: true
     storage: false

diff --git a/deploy/crds/enterprise.splunk.com_standalones_crd.yaml b/deploy/crds/enterprise.splunk.com_standalones_crd.yaml
@@ -30,7 +30,7 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v1
+    name: v2
     schema:
       openAPIV3Schema:
         description: Standalone is the Schema for a Splunk Enterprise standalone instances.
@@ -1158,7 +1158,6 @@ spec:
                               x-kubernetes-int-or-string: true
                           required:
                           - port
-                          - protocol
                           type: object
                         type: array
                         x-kubernetes-list-map-keys:
@@ -2933,6 +2932,15 @@ spec:
         specReplicasPath: .spec.replicas
         statusReplicasPath: .status.replicas
       status: {}
+  - name: v1
+    served: true
+    storage: false
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          apiVersion:
+            type: string
   - name: v1beta1
     served: true
     storage: false

diff --git a/deploy/examples/advanced/c1.yaml b/deploy/examples/advanced/c1.yaml
@@ -1,4 +1,4 @@
-apiVersion: enterprise.splunk.com/v1
+apiVersion: enterprise.splunk.com/v2
 kind: LicenseMaster
 metadata:
   name: lm-example
@@ -11,7 +11,7 @@ spec:
         name: splunk-licenses
   licenseUrl: /mnt/licenses/enterprise.lic
 ---
-apiVersion: enterprise.splunk.com/v1
+apiVersion: enterprise.splunk.com/v2
 kind: ClusterMaster
 metadata:
   name: cm-example
@@ -21,20 +21,20 @@ spec:
   licenseMasterRef:
     name: lm-example
 ---
-apiVersion: enterprise.splunk.com/v1
+apiVersion: enterprise.splunk.com/v2
 kind: IndexerCluster
 metadata:
   name: idxc-example
   finalizers:
   - enterprise.splunk.com/delete-pvc
 spec:
-  replicas: <n>
+  replicas: 4
   clusterMasterRef:
     name: cm-example
   licenseMasterRef:
     name: lm-example
 ---
-apiVersion: enterprise.splunk.com/v1
+apiVersion: enterprise.splunk.com/v2
 kind: Standalone
 metadata:
   name: sh-example

diff --git a/deploy/examples/clustermaster/default.yaml b/deploy/examples/clustermaster/default.yaml
@@ -1,5 +1,5 @@
-apiVersion: enterprise.splunk.com/v1
+apiVersion: enterprise.splunk.com/v2
 kind: ClusterMaster
 metadata:
   name: test
-spec: {}
+spec: {}
diff --git a/deploy/examples/indexercluster/default.yaml b/deploy/examples/indexercluster/default.yaml
@@ -1,4 +1,4 @@
-apiVersion: enterprise.splunk.com/v1
+apiVersion: enterprise.splunk.com/v2
 kind: IndexerCluster
 metadata:
   name: test

diff --git a/deploy/examples/licensemaster/default.yaml b/deploy/examples/licensemaster/default.yaml
@@ -1,4 +1,4 @@
-apiVersion: enterprise.splunk.com/v1
+apiVersion: enterprise.splunk.com/v2
 kind: LicenseMaster
 metadata:
   name: test

diff --git a/deploy/examples/searchheadcluster/default.yaml b/deploy/examples/searchheadcluster/default.yaml
@@ -1,4 +1,4 @@
-apiVersion: enterprise.splunk.com/v1
+apiVersion: enterprise.splunk.com/v2
 kind: SearchHeadCluster
 metadata:
   name: test

diff --git a/deploy/examples/standalone/default.yaml b/deploy/examples/standalone/default.yaml
@@ -1,4 +1,4 @@
-apiVersion: enterprise.splunk.com/v1
+apiVersion: enterprise.splunk.com/v2
 kind: Standalone
 metadata:
   name: test