Ephemeral storage

build/make_bundle.sh

@@ -5,13 +5,32 @@
 set -e
 
 VERSION=`grep "Version.*=.*\".*\"" version/version.go | sed "s,.*Version.*=.*\"\(.*\)\".*,\1,"`
+OLD_VERSIONS="v1alpha2"
 DOCKER_IO_PATH="docker.io/splunk"
 REDHAT_REGISTRY_PATH="registry.connect.redhat.com/splunk"
 OPERATOR_IMAGE="$DOCKER_IO_PATH/splunk-operator:${VERSION}"
 OLM_CATALOG=deploy/olm-catalog
 OLM_CERTIFIED=deploy/olm-certified
 YAML_SCRIPT_FILE=.yq_script.yaml
 
+# create yq template to append older CRD versions
+rm -f $YAML_SCRIPT_FILE
+for v in $OLD_VERSIONS; do
+  cat << EOF >>$YAML_SCRIPT_FILE
+- command: update
+  path: spec.versions[+]
+  value:
+    name: $v
+    served: true
+    storage: false
+EOF
+done
+
+# append older versions to CRD files
+for crd in deploy/crds/*_crd.yaml; do
+  yq w -i -s $YAML_SCRIPT_FILE $crd
+done
+
 RESOURCES="
   - kind: StatefulSets
     version: apps/v1
@@ -130,5 +149,5 @@ mkdir -p $OLM_CERTIFIED/splunk
 cp $OLM_CATALOG/splunk/$VERSION/*_crd.yaml $OLM_CERTIFIED/splunk/
 yq w $OLM_CATALOG/splunk/$VERSION/splunk.v${VERSION}.clusterserviceversion.yaml metadata.certified "true" > $OLM_CERTIFIED/splunk/splunk.v${VERSION}.clusterserviceversion.yaml
 yq w $OLM_CATALOG/splunk/splunk.package.yaml packageName "splunk-certified" > $OLM_CERTIFIED/splunk/splunk.package.yaml
-sed -i '' "s,$DOCKER_IO_PATH/spark,$REDHAT_REGISTRY_PATH/spark,g" $OLM_CERTIFIED/splunk/splunk.v${VERSION}.clusterserviceversion.yaml
+sed -i'' "s,$DOCKER_IO_PATH/spark,$REDHAT_REGISTRY_PATH/spark,g" $OLM_CERTIFIED/splunk/splunk.v${VERSION}.clusterserviceversion.yaml
 zip $OLM_CERTIFIED/splunk.zip -j $OLM_CERTIFIED/splunk $OLM_CERTIFIED/splunk/*

deploy/crds/enterprise.splunk.com_indexerclusters_crd.yaml

@@ -641,6 +641,10 @@ spec:
               description: Full path or URL for one or more default.yml files, separated
                 by commas
               type: string
+            ephemeralStorage:
+              description: If true, ephemeral (emptyDir) storage will be used for
+                /opt/splunk/etc and /opt/splunk/var volumes
+              type: boolean
             etcStorage:
               description: Storage capacity to request for /opt/splunk/etc persistent
                 volume claims (default=”1Gi”)
@@ -2307,8 +2311,11 @@ spec:
               type: boolean
           type: object
       type: object
-  version: v1alpha2
+  version: v1alpha3
   versions:
-  - name: v1alpha2
+  - name: v1alpha3
     served: true
     storage: true
+  - name: v1alpha2
+    served: true
+    storage: false

deploy/crds/enterprise.splunk.com_licensemasters_crd.yaml

@@ -624,6 +624,10 @@ spec:
               description: Full path or URL for one or more default.yml files, separated
                 by commas
               type: string
+            ephemeralStorage:
+              description: If true, ephemeral (emptyDir) storage will be used for
+                /opt/splunk/etc and /opt/splunk/var volumes
+              type: boolean
             etcStorage:
               description: Storage capacity to request for /opt/splunk/etc persistent
                 volume claims (default=”1Gi”)
@@ -2220,8 +2224,11 @@ spec:
               type: string
           type: object
       type: object
-  version: v1alpha2
+  version: v1alpha3
   versions:
-  - name: v1alpha2
+  - name: v1alpha3
     served: true
     storage: true
+  - name: v1alpha2
+    served: true
+    storage: false

deploy/crds/enterprise.splunk.com_searchheadclusters_crd.yaml

@@ -641,6 +641,10 @@ spec:
               description: Full path or URL for one or more default.yml files, separated
                 by commas
               type: string
+            ephemeralStorage:
+              description: If true, ephemeral (emptyDir) storage will be used for
+                /opt/splunk/etc and /opt/splunk/var volumes
+              type: boolean
             etcStorage:
               description: Storage capacity to request for /opt/splunk/etc persistent
                 volume claims (default=”1Gi”)
@@ -2351,8 +2355,11 @@ spec:
               type: string
           type: object
       type: object
-  version: v1alpha2
+  version: v1alpha3
   versions:
-  - name: v1alpha2
+  - name: v1alpha3
     served: true
     storage: true
+  - name: v1alpha2
+    served: true
+    storage: false

deploy/crds/enterprise.splunk.com_sparks_crd.yaml

@@ -983,8 +983,11 @@ spec:
               type: string
           type: object
       type: object
-  version: v1alpha2
+  version: v1alpha3
   versions:
-  - name: v1alpha2
+  - name: v1alpha3
     served: true
     storage: true
+  - name: v1alpha2
+    served: true
+    storage: false

deploy/crds/enterprise.splunk.com_standalones_crd.yaml

@@ -634,6 +634,10 @@ spec:
               description: Full path or URL for one or more default.yml files, separated
                 by commas
               type: string
+            ephemeralStorage:
+              description: If true, ephemeral (emptyDir) storage will be used for
+                /opt/splunk/etc and /opt/splunk/var volumes
+              type: boolean
             etcStorage:
               description: Storage capacity to request for /opt/splunk/etc persistent
                 volume claims (default=”1Gi”)
@@ -2287,8 +2291,11 @@ spec:
               type: string
           type: object
       type: object
-  version: v1alpha2
+  version: v1alpha3
   versions:
-  - name: v1alpha2
+  - name: v1alpha3
     served: true
     storage: true
+  - name: v1alpha2
+    served: true
+    storage: false