Merge pull request #292 from splunk/1.0.0-RC-mergeMaster

1.0.0 rc merge master

Author: smohan-splunk

.circleci/config.yml

@@ -282,7 +282,7 @@ jobs:
             mkdir -p /tmp/test-results
             find ./test -name "*junit.xml" -exec cp {} /tmp/test-results \;
           environment: 
-            TEST_FOCUS: "smoke|ingest_search|monitoring_console|deletecr|smartstore"
+            TEST_FOCUS: "smoke|ingest_search|monitoring_console|smartstore|licensemaster|scaling_test|crcrud|secret"
       - store_test_results:
           name: Save test results
           path: /tmp/test-results

Makefile

@@ -28,7 +28,7 @@ builder-image:
 
 builder-test:
 	@echo Running unit tests for splunk-operator inside of builder container
-	@docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/opt/app-root/src/splunk-operator -w /opt/app-root/src/splunk-operator -u root -it splunk/splunk-operator-builder bash -c "go test -v -covermode=count -coverprofile=coverage.out --timeout=300s github.com/splunk/splunk-operator/pkg/splunk/common github.com/splunk/splunk-operator/pkg/splunk/spark github.com/splunk/splunk-operator/pkg/splunk/enterprise github.com/splunk/splunk-operator/pkg/splunk/controller github.com/splunk/splunk-operator/pkg/splunk/client github.com/splunk/splunk-operator/pkg/splunk/util"
+	@docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/opt/app-root/src/splunk-operator -w /opt/app-root/src/splunk-operator -u root -it splunk/splunk-operator-builder bash -c "go test -v -covermode=count -coverprofile=coverage.out --timeout=300s github.com/splunk/splunk-operator/pkg/splunk/common github.com/splunk/splunk-operator/pkg/splunk/enterprise github.com/splunk/splunk-operator/pkg/splunk/controller github.com/splunk/splunk-operator/pkg/splunk/client github.com/splunk/splunk-operator/pkg/splunk/util"
 
 image:
 	@echo Building splunk-operator image
@@ -45,7 +45,7 @@ scorecard:
 
 test:
 	@echo Running unit tests for splunk-operator
-	@go test -v -covermode=count -coverprofile=coverage.out --timeout=300s github.com/splunk/splunk-operator/pkg/splunk/common github.com/splunk/splunk-operator/pkg/splunk/spark github.com/splunk/splunk-operator/pkg/splunk/enterprise github.com/splunk/splunk-operator/pkg/splunk/controller github.com/splunk/splunk-operator/pkg/splunk/client github.com/splunk/splunk-operator/pkg/splunk/util
+	@go test -v -covermode=count -coverprofile=coverage.out --timeout=300s github.com/splunk/splunk-operator/pkg/splunk/common github.com/splunk/splunk-operator/pkg/splunk/enterprise github.com/splunk/splunk-operator/pkg/splunk/controller github.com/splunk/splunk-operator/pkg/splunk/client github.com/splunk/splunk-operator/pkg/splunk/util
 
 stop_clair_scanner:
 	@docker stop clair_db || true

README.md

@@ -75,15 +75,14 @@ This repository consists of the following code used to build the splunk-operator
 * `pkg/apis/`: Source code for the operator's custom resource definition types
 * `pkg/controllers/`: Used to register controllers that watch for changes to custom resources
 * `pkg/splunk/enterprise/`: Source code for controllers that manage Splunk Enterprise resources
-* `pkg/splunk/spark/`: Source code for controllers that manage Spark resources
 * `pkg/splunk/controller/`: Common code shared across Splunk controllers
 * `pkg/splunk/common/`: Common code used by most other splunk packages
 * `pkg/splunk/client/`: Simple client for Splunk Enterprise REST API
 * `pkg/splunk/test/`: Common code used by other packages for unit testing
 
-`main()` uses `pkg/controllers` to register all the `enterprise` and `spark`
-controllers that manage custom resources by watching for Kubernetes events.
-The `enterprise` and `spark` controllers are implemented using common code provided
+`main()` uses `pkg/controllers` to register all the `enterprise` controllers
+that manage custom resources by watching for Kubernetes events.
+The `enterprise`  controllers are implemented using common code provided
 by the `controllers` package. The `enterprise` controllers also use the REST API client
 provided in the `pkg/splunk/client` package. The types provided by `pkg/apis/` and
 common code in the `pkg/splunk/common/` package are used universally. Note that the

build/make_bundle.sh

@@ -5,7 +5,7 @@
 set -e
 
 VERSION=`grep "Version.*=.*\".*\"" version/version.go | sed "s,.*Version.*=.*\"\(.*\)\".*,\1,"`
-OLD_VERSIONS="v1alpha3 v1alpha2"
+OLD_VERSIONS="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}"
@@ -77,17 +77,14 @@ cat << EOF >$YAML_SCRIPT_FILE
 - command: update
   path: spec.customresourcedefinitions.owned[2].displayName
   value: SearchHeadCluster
-- command: update
-  path: spec.customresourcedefinitions.owned[3].displayName
-  value: Spark
 - command: update
   path: spec.customresourcedefinitions.owned[4].displayName
   value: Standalone
 - command: update
   path: metadata.annotations.alm-examples
   value: |-
     [{
-      "apiVersion": "enterprise.splunk.com/v1beta1",
+      "apiVersion": "enterprise.splunk.com/v1",
       "kind": "IndexerCluster",
       "metadata": {
         "name": "example",
@@ -98,7 +95,7 @@ cat << EOF >$YAML_SCRIPT_FILE
       }
     },
     {
-      "apiVersion": "enterprise.splunk.com/v1beta1",
+      "apiVersion": "enterprise.splunk.com/v1",
       "kind": "LicenseMaster",
       "metadata": {
         "name": "example",
@@ -107,7 +104,7 @@ cat << EOF >$YAML_SCRIPT_FILE
       "spec": {}
     },
     {
-      "apiVersion": "enterprise.splunk.com/v1beta1",
+      "apiVersion": "enterprise.splunk.com/v1",
       "kind": "SearchHeadCluster",
       "metadata": {
         "name": "example",
@@ -118,17 +115,7 @@ cat << EOF >$YAML_SCRIPT_FILE
       }
     },
     {
-      "apiVersion": "enterprise.splunk.com/v1beta1",
-      "kind": "Spark",
-      "metadata": {
-        "name": "example"
-      },
-      "spec": {
-        "replicas": 1
-      }
-    },
-    {
-      "apiVersion": "enterprise.splunk.com/v1beta1",
+      "apiVersion": "enterprise.splunk.com/v1",
       "kind": "Standalone",
       "metadata": {
         "name": "example",
@@ -151,6 +138,4 @@ yq w $OLM_CATALOG/splunk/$VERSION/splunk.v${VERSION}.clusterserviceversion.yaml
 yq w $OLM_CATALOG/splunk/splunk.package.yaml packageName "splunk-certified" > $OLM_CERTIFIED/splunk/splunk.package.yaml
 
 # Mac OS expects sed -i '', Linux expects sed -i''. To workaround this, using .bak
-sed -i.bak "s,$DOCKER_IO_PATH/spark,$REDHAT_REGISTRY_PATH/spark,g" $OLM_CERTIFIED/splunk/splunk.v${VERSION}.clusterserviceversion.yaml
-rm -f $OLM_CERTIFIED/splunk/splunk.v${VERSION}.clusterserviceversion.yaml.bak
 zip $OLM_CERTIFIED/splunk.zip -j $OLM_CERTIFIED/splunk $OLM_CERTIFIED/splunk/*

deploy/crds/enterprise.splunk.com_clustermasters_crd.yaml

@@ -1098,12 +1098,6 @@ spec:
                     type: object
                   type: array
               type: object
-            sparkImage:
-              description: Image to use for Spark pod containers (overrides RELATED_IMAGE_SPLUNK_SPARK
-                environment variables). Also used on cluster master for init container
-                to setup the soft links from ../master-apps/splunk-operator/local/
-                to /mnt/splunk-operator/local/
-              type: string
             tolerations:
               description: Pod's tolerations for Kubernetes node's taint
               items:
@@ -2474,11 +2468,14 @@ spec:
               type: object
           type: object
       type: object
-  version: v1beta1
+  version: v1
   versions:
-  - name: v1beta1
+  - name: v1
     served: true
     storage: true
+  - name: v1beta1
+    served: true
+    storage: false
   - name: v1alpha3
     served: true
     storage: false

deploy/crds/enterprise.splunk.com_indexerclusters_crd.yaml

@@ -2351,11 +2351,14 @@ spec:
               type: boolean
           type: object
       type: object
-  version: v1beta1
+  version: v1
   versions:
-  - name: v1beta1
+  - name: v1
     served: true
     storage: true
+  - name: v1beta1
+    served: true
+    storage: false
   - name: v1alpha3
     served: true
     storage: false

deploy/crds/enterprise.splunk.com_licensemasters_crd.yaml

@@ -2251,11 +2251,14 @@ spec:
               type: string
           type: object
       type: object
-  version: v1beta1
+  version: v1
   versions:
-  - name: v1beta1
+  - name: v1
     served: true
     storage: true
+  - name: v1beta1
+    served: true
+    storage: false
   - name: v1alpha3
     served: true
     storage: false

deploy/crds/enterprise.splunk.com_searchheadclusters_crd.yaml

@@ -1022,48 +1022,6 @@ spec:
                       type: object
                   type: object
               type: object
-            sparkImage:
-              description: Image to use for Spark pod containers (overrides RELATED_IMAGE_SPLUNK_SPARK
-                environment variables)
-              type: string
-            sparkRef:
-              description: SparkRef refers to a Spark cluster managed by the operator
-                within Kubernetes When defined, Data Fabric Search (DFS) will be enabled
-                and configured to use the Spark cluster.
-              properties:
-                apiVersion:
-                  description: API version of the referent.
-                  type: string
-                fieldPath:
-                  description: 'If referring to a piece of an object instead of an
-                    entire object, this string should contain a valid JSON/Go field
-                    access statement, such as desiredState.manifest.containers[2].
-                    For example, if the object reference is to a container within
-                    a pod, this would take on a value like: "spec.containers{name}"
-                    (where "name" refers to the name of the container that triggered
-                    the event) or if no container name is specified "spec.containers[2]"
-                    (container with index 2 in this pod). This syntax is chosen only
-                    to have some well-defined way of referencing a part of an object.
-                    TODO: this design is not final and this field is subject to change
-                    in the future.'
-                  type: string
-                kind:
-                  description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                  type: string
-                name:
-                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                  type: string
-                namespace:
-                  description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                  type: string
-                resourceVersion:
-                  description: 'Specific resourceVersion to which this reference is
-                    made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                  type: string
-                uid:
-                  description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                  type: string
-              type: object
             tolerations:
               description: Pod's tolerations for Kubernetes node's taint
               items:
@@ -2401,11 +2359,14 @@ spec:
               type: array
           type: object
       type: object
-  version: v1beta1
+  version: v1
   versions:
-  - name: v1beta1
+  - name: v1
     served: true
     storage: true
+  - name: v1beta1
+    served: true
+    storage: false
   - name: v1alpha3
     served: true
     storage: false