Add configuration items to support targeting the development environment at an remote Kubernetes cluster.

Author: brownleej

.gitignore

@@ -35,6 +35,7 @@ foundationdb-kubernetes-sidecar/website
 
 config/default/manager_image_patch.yaml
 config/default/manager_image_patch.yaml-e
+config/development/kustomization.yaml
 
 # General temp directory
 tmp/

Makefile

@@ -2,6 +2,7 @@
 
 # Image URL to use all building/pushing image targets
 IMG ?= fdb-kubernetes-operator:latest
+REMOTE_BUILD ?= 0
 CRD_OPTIONS ?= "crd:maxDescLen=0,crdVersions=v1,generateEmbeddedObjectMeta=true"
 
 ifneq "$(FDB_WEBSITE)" ""
@@ -67,7 +68,7 @@ endif
 
 all: deps generate fmt vet manager snapshot manifests samples documentation test_if_changed
 
-.PHONY: clean all manager samples documentation run install uninstall deploy manifests fmt vet generate container-build container-push rebuild-operator bounce lint
+.PHONY: clean all manager samples documentation run install uninstall deploy manifests fmt vet generate container-build container-push container-push-if-remote rebuild-operator bounce lint
 
 deps: $(BUILD_DEPS)
 
@@ -78,6 +79,7 @@ clean:
 	rm -r bin
 	rm -f $(SAMPLES)
 	rm -f config/rbac/role.yaml
+	rm -f config/development/kustomization.yaml
 	rm -rf ./dist/*
 	find . -name "cover.out" -delete
 
@@ -120,9 +122,20 @@ install: manifests
 uninstall: manifests
 	kustomize build config/crd | kubectl $(KUBECTL_ARGS) delete -f -
 
-# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
-deploy: install manifests
+# Apply config to the local development environment based on environment
+# variables.
+config/development/kustomization.yaml: config/development/kustomization.yaml.sample
+	cp config/development/kustomization.yaml.sample config/development/kustomization.yaml
 	cd config/development && kustomize edit set image foundationdb/fdb-kubernetes-operator=${IMG}
+ifneq "$(IMG_PREFIX)" ""
+	cd config/development && kustomize edit set image foundationdb/foundationdb-kubernetes-sidecar=${IMG_PREFIX}/foundationdb/foundationdb-kubernetes-sidecar
+endif
+ifeq "$(REMOTE_BUILD)" "1"
+	cd config/development && kustomize edit add patch --path=remote_build.yaml
+endif
+
+# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
+deploy: install manifests config/development/kustomization.yaml
 	kustomize build config/development | kubectl $(KUBECTL_ARGS) apply -f -
 
 # Generate manifests e.g. CRD, RBAC etc.
@@ -164,8 +177,14 @@ container-build: test_if_changed
 container-push:
 	$(BUILDER) push ${IMG}
 
+# Push the container image
+container-push-if-remote:
+ifeq "$(REMOTE_BUILD)" "1"
+	$(BUILDER) push ${IMG}
+endif
+
 # Rebuilds, deploys, and bounces the operator
-rebuild-operator: container-build deploy bounce
+rebuild-operator: container-build container-push-if-remote deploy bounce
 
 bounce:
 	kubectl $(KUBECTL_ARGS) delete pod -l app=fdb-kubernetes-operator-controller-manager

config/development/kustomization.yaml …ig/development/kustomization.yaml.sampleconfig/development/kustomization.yaml renamed to config/development/kustomization.yaml.sample config/development/kustomization.yaml renamed to config/development/kustomization.yaml.sample

@@ -0,0 +1,10 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: controller-manager
+spec:
+  template:
+    spec:
+      containers:
+        - name: manager
+          imagePullPolicy: Always

config/development/remote_build.yaml

@@ -17,7 +17,7 @@ spec:
       automountServiceAccountToken: false
       initContainers:
         - name: foundationdb-kubernetes-init-7-1
-          image: foundationdb/foundationdb-kubernetes-sidecar:7.1.0-rc2-1
+          image: foundationdb/foundationdb-kubernetes-sidecar:7.1.5-1
           imagePullPolicy: IfNotPresent
           args:
             - "--copy-file"

config/tests/dns/client.yaml

@@ -1,6 +1,6 @@
 - op: add
   path: "/spec/version"
-  value: 7.1.0-rc2
+  value: 7.1.5
 - op: add
   path: "/spec/routing/useDNSInClusterFile"
   value: true