Initial commit of files from botched PR

Signed-off-by: Kristin Martin <[email protected]>

Makefile

@@ -60,6 +60,7 @@ deploy: manifests
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: mod-tidy controller-gen
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=solr-operator-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	kustomize build config/crd > helm/solr-operator/crds/crds.yaml
 
 # Run go fmt against code
 fmt:

config/crd/kustomization.yaml

@@ -9,7 +9,7 @@ resources:
 - bases/solr.bloomberg.com_solrcollectionaliases.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
-patchesStrategicMerge:
+patchesStrategicMerge: []
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
 #- patches/webhook_in_solrclouds.yaml
@@ -31,3 +31,7 @@ patchesStrategicMerge:
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml
+
+# Uncomment if using Helm 2; not needed for Helm 3
+# commonAnnotations:
+#   helm.sh/hook: "crd-install"

go.mod

@@ -3,31 +3,18 @@ module github.com/bloomberg/solr-operator
 go 1.13
 
 require (
-	cloud.google.com/go v0.38.0 // indirect
 	github.com/coreos/etcd-operator v0.9.3
 	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
 	github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect
 	github.com/go-logr/logr v0.1.0
-	github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d // indirect
-	github.com/google/uuid v1.1.1 // indirect
-	github.com/hashicorp/golang-lru v0.5.1 // indirect
-	github.com/json-iterator/go v1.1.7 // indirect
-	github.com/onsi/ginkgo v1.8.0 // indirect
 	github.com/onsi/gomega v1.5.0
 	github.com/pravega/zookeeper-operator v0.2.5-rc0
 	github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da
-	github.com/spf13/pflag v1.0.3 // indirect
 	github.com/stretchr/testify v1.3.0
-	golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 // indirect
 	golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
-	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
-	golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f // indirect
-	golang.org/x/text v0.3.2 // indirect
 	k8s.io/api v0.0.0-20191016110246-af539daaa43a
 	k8s.io/apimachinery v0.0.0-20191004115701-31ade1b30762
 	k8s.io/client-go v0.0.0-20191016110837-54936ba21026
-	k8s.io/klog v0.4.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf // indirect
-	k8s.io/utils v0.0.0-20190801114015-581e00157fb1 // indirect
 	sigs.k8s.io/controller-runtime v0.3.0
+	sigs.k8s.io/controller-tools v0.2.2 // indirect
 )

hack/install_dependencies.sh

@@ -11,6 +11,9 @@ arch=$(go env GOARCH)
 # Install go modules 
 GO111MODULE=on go mod tidy 
 
+#Install Kustomize
+GO111MODULE=on go install sigs.k8s.io/kustomize/kustomize/v3
+
 # Install Kubebuilder
 curl -sL https://go.kubebuilder.io/dl/${kubebuilder_version}/${os}/${arch} | tar -xz -C /tmp/
 sudo mv /tmp/kubebuilder_${kubebuilder_version}_${os}_${arch} /usr/local/kubebuilder

helm/solr-operator/.helmignore

@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

helm/solr-operator/Chart.yaml

@@ -0,0 +1,6 @@
+
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart Solr Operator
+name: solr-operator
+version: 0.1.0

helm/solr-operator/README.md

@@ -0,0 +1,53 @@
+solr-operator
+=============
+A Helm chart for [Solr Operator]
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+$ helm install --name my-release
+```
+
+The command deploys envoy on the Kubernetes cluster with the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+
+## About CRDs
+
+Helm 2:
+
+If you are using Helm 2, CRDs are installed using the crd-install hook. Prior to installing, you'll need to uncomment the last two lines in [kustomization.yaml](../../config/crd/kustomization.yaml), and run `make manifests`
+
+Helm 3:
+
+Helm 3 automatically runs CRDs in the /crds directory, no further action is needed.
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```console
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+
+
+## Chart Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| useEtcdOperator | string | `"true"` |  |
+| fullnameOverride | string | `""` |  |
+| image.pullPolicy | string | `"Always"` |  |
+| image.repository | string | `"bloomberg/solr-operator"` |  |
+| image.tag | string | `"v0.2.0"` |  |
+| ingressBaseDomain | string | `""` |  |
+| nameOverride | string | `""` |  |
+| replicaCount | int | `1` |  |
+| resources.limits.cpu | string | `"400m"` |  |
+| resources.limits.memory | string | `"500Mi"` |  |
+| resources.requests.cpu | string | `"100m"` |  |
+| resources.requests.memory | string | `"100Mi"` |  |
+| useZkOperator | string | `"true"` |  |