Managed updates scaling

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/resources github.com/splunk/splunk-operator/pkg/splunk/spark github.com/splunk/splunk-operator/pkg/splunk/enterprise github.com/splunk/splunk-operator/pkg/splunk/reconcile"
+	@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/resources github.com/splunk/splunk-operator/pkg/splunk/spark github.com/splunk/splunk-operator/pkg/splunk/enterprise github.com/splunk/splunk-operator/pkg/splunk/reconcile github.com/splunk/splunk-operator/pkg/splunk/client"
 
 image:
 	@echo Building splunk-operator image
@@ -41,7 +41,7 @@ local:
 
 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/resources github.com/splunk/splunk-operator/pkg/splunk/spark github.com/splunk/splunk-operator/pkg/splunk/enterprise github.com/splunk/splunk-operator/pkg/splunk/reconcile
+	@go test -v -covermode=count -coverprofile=coverage.out --timeout=300s github.com/splunk/splunk-operator/pkg/splunk/resources github.com/splunk/splunk-operator/pkg/splunk/spark github.com/splunk/splunk-operator/pkg/splunk/enterprise github.com/splunk/splunk-operator/pkg/splunk/reconcile github.com/splunk/splunk-operator/pkg/splunk/client
 
 stop_clair_scanner:
 	@docker stop clair_db || true
@@ -77,9 +77,9 @@ generate:
 	@echo "---" >> deploy/crds/combined.yaml
 	@cat deploy/crds/enterprise.splunk.com_licensemasters_crd.yaml >> deploy/crds/combined.yaml
 	@echo "---" >> deploy/crds/combined.yaml
-	@cat deploy/crds/enterprise.splunk.com_searchheads_crd.yaml >> deploy/crds/combined.yaml
+	@cat deploy/crds/enterprise.splunk.com_searchheadclusters_crd.yaml >> deploy/crds/combined.yaml
 	@echo "---" >> deploy/crds/combined.yaml
-	@cat deploy/crds/enterprise.splunk.com_indexers_crd.yaml >> deploy/crds/combined.yaml
+	@cat deploy/crds/enterprise.splunk.com_indexerclusters_crd.yaml >> deploy/crds/combined.yaml
 	@echo "---" >> deploy/crds/combined.yaml
 	@cat deploy/crds/enterprise.splunk.com_sparks_crd.yaml >> deploy/crds/combined.yaml
 	@echo Rebuilding deploy/all-in-one-scoped.yaml

README.md

@@ -76,6 +76,8 @@ This repository consists of the following code used to build the splunk-operator
 * `pkg/splunk/enterprise/`: Source code for managing Splunk Enterprise deployments
 * `pkg/splunk/spark/`: Source code for managing Spark cluster deployments
 * `pkg/splunk/resources/`: Generic utility code used by other splunk modules
+* `pkg/splunk/client/`: Simple client for Splunk Enterprise REST API
+* `pkg/splunk/test/`: Common code used for testing other modules
 
 `main()` basically just instantiates the `controllers`, and the `controllers` call
 into the `reconcile` module to perform actions. The `reconcile` module uses the `enterprise`

build/Dockerfile

@@ -16,10 +16,10 @@ LABEL name="splunk" \
 COPY build/_output/bin/splunk-operator ${OPERATOR}
 
 COPY build/bin /usr/local/bin
-RUN mkdir /licenses \
-    && curl -o /licenses/apache-2.0.txt https://www.apache.org/licenses/LICENSE-2.0.txt \
-    && curl -o /licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf \
-    && /usr/local/bin/user_setup
+RUN mkdir /licenses && /usr/local/bin/user_setup
+
+COPY build/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf /licenses
+COPY LICENSE /licenses/LICENSE-2.0.txt
 
 ENTRYPOINT ["/usr/local/bin/entrypoint"]