*: separate base image code and build from example

Author: joelanford

Dockerfile

@@ -18,10 +18,9 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM alpine
+FROM gcr.io/distroless/static:nonroot
 WORKDIR /
-COPY helm-charts/ helm-charts/
-COPY watches.yaml watches.yaml
 COPY --from=builder /workspace/manager .
+USER nonroot:nonroot
 
 ENTRYPOINT ["/manager"]

Makefile

@@ -1,8 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= controller:latest
-# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true"
+IMG ?= quay.io/joelanford/helm-operator
 
 SHELL=/bin/bash
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
@@ -15,34 +13,13 @@ endif
 all: manager
 
 # Run tests
-test: generate fmt vet manifests testbin
+test: generate fmt vet testbin
 	go test -race -covermode atomic -coverprofile cover.out ./...
 
 # Build manager binary
 manager: generate fmt vet
 	go build -o bin/manager main.go
 
-# Run against the configured Kubernetes cluster in ~/.kube/config
-run: generate fmt vet manifests
-	go run ./main.go
-
-# Install CRDs into a cluster
-install: manifests
-	kustomize build config/crd | kubectl apply -f -
-
-# Uninstall CRDs from a cluster
-uninstall: manifests
-	kustomize build config/crd | kubectl delete -f -
-
-# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
-deploy: manifests
-	cd config/manager && kustomize edit set image controller=${IMG}
-	kustomize build config/default | kubectl apply -f -
-
-# Generate manifests e.g. CRD, RBAC etc.
-manifests: controller-gen
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
-
 # Run go fmt against code
 fmt:
 	go fmt ./...

config/manager/kustomization.yaml

@@ -0,0 +1,6 @@
+FROM quay.io/joelanford/helm-operator:latest
+
+ENV HOME=/opt/helm
+COPY watches.yaml ${HOME}/watches.yaml
+COPY helm-charts  ${HOME}/helm-charts
+WORKDIR ${HOME}

example/Dockerfile

@@ -0,0 +1,35 @@
+
+# Image URL to use all building/pushing image targets
+IMG ?= quay.io/joelanford/nginx-operator
+
+all: docker-build
+
+# Run against the configured Kubernetes cluster in ~/.kube/config
+run:
+	go run ../main.go
+
+# Install CRDs into a cluster
+install:
+	kustomize build config/crd | kubectl apply -f -
+
+# Uninstall CRDs from a cluster
+uninstall:
+	kustomize build config/crd | kubectl delete -f -
+
+# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
+deploy:
+	cd config/manager && kustomize edit set image controller=${IMG}
+	kustomize build config/default | kubectl apply -f -
+
+# Undeploy controller in the configured Kubernetes cluster in ~/.kube/config
+undeploy:
+	cd config/manager && kustomize edit set image controller=${IMG}
+	kustomize build config/default | kubectl delete -f -
+
+# Build the docker image
+docker-build:
+	docker build . -t ${IMG}
+
+# Push the docker image
+docker-push:
+	docker push ${IMG}

example/Makefile

@@ -6,20 +6,20 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.4
   creationTimestamp: null
-  name: tomcats.apache.sdk.operatorframework.io
+  name: nginxes.helm.sdk.operatorframework.io
 spec:
-  group: apache.sdk.operatorframework.io
+  group: helm.sdk.operatorframework.io
   names:
-    kind: Tomcat
-    listKind: TomcatList
-    plural: tomcats
-    singular: tomcat
+    kind: Nginx
+    listKind: NginxList
+    plural: nginxes
+    singular: nginx
   scope: Namespaced
   versions:
   - name: v1
     schema:
       openAPIV3Schema:
-        description: Tomcat is the Schema for the tomcats API
+        description: Nginx is the Schema for the nginxes API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -34,10 +34,10 @@ spec:
           metadata:
             type: object
           spec:
-            description: TomcatSpec defines the desired state of Tomcat
+            description: NginxSpec defines the desired state of Nginx
             type: object
           status:
-            description: TomcatStatus defines the observed state of Tomcat
+            description: NginxStatus defines the observed state of Nginx
             type: object
         type: object
     served: true

config/certmanager/certificate.yaml renamed to example/config/certmanager/certificate.yaml

@@ -2,18 +2,18 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/apache.sdk.operatorframework.io_tomcats.yaml
+- bases/helm.sdk.operatorframework.io_nginxes.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 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_tomcats.yaml
+#- patches/webhook_in_nginxes.yaml
 # +kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
 # patches here are for enabling the CA injection for each CRD
-#- patches/cainjection_in_tomcats.yaml
+#- patches/cainjection_in_nginxes.yaml
 # +kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.