devfile · amisevsk · Feb 10, 2021 · Feb 2, 2021 · Feb 3, 2021 · Feb 3, 2021
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+deploy/deployment/*             linguist-generated
+deploy/templates/crd/bases/*    linguist-generated
diff --git a/.github/workflows/dockerimage-next.yml b/.github/workflows/dockerimage-next.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 Red Hat, Inc.
 # This program and the accompanying materials are made
 # available under the terms of the Eclipse Public License 2.0
 # which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -60,7 +60,6 @@ jobs:
     -
       name: Check manifests
       run: |
-        git reset HEAD --hard
         pip install yq
         # Note: fmt is necessary after generate since generated sources will
         #       fail format check by default.
@@ -70,6 +69,14 @@ jobs:
           echo "generated sources are not up to date"
           exit 1
         fi
+    -
+      name: Check deployment files
+      run: |
+        make generate_default_deployment
+        if [[ ! -z $(git status -s) ]]; then
+          echo "Generated deployment files are out of date; run make generate_default_deployment"
+          exit 1
+        fi
     -
       name: Run Go Tests
       run: |

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 devworkspace-crds
-config/crd/bases/workspace.devfile.io_devworkspaces.yaml
-config/crd/bases/workspace.devfile.io_devworkspacetemplates.yaml
+deploy/templates/crd/bases/workspace.devfile.io_devworkspaces.yaml
+deploy/templates/crd/bases/workspace.devfile.io_devworkspacetemplates.yaml
+deploy/current
 testbin
 .vscode
 __debug_bin

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2020 Red Hat, Inc.
+# Copyright (c) 2019-2021 Red Hat, Inc.
 # This program and the accompanying materials are made
 # available under the terms of the Eclipse Public License 2.0
 # which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -21,10 +21,9 @@ export NAMESPACE ?= devworkspace-controller
 export IMG ?= quay.io/devfile/devworkspace-controller:next
 export ROUTING_SUFFIX ?= 192.168.99.100.nip.io
 export PULL_POLICY ?= Always
-export WEBHOOK_ENABLED ?= true
 export DEFAULT_ROUTING ?= basic
 export KUBECONFIG ?= ${HOME}/.kube/config
-DEVWORKSPACE_API_VERSION ?= aeda60d4361911da85103f224644bfa792498499
+export DEVWORKSPACE_API_VERSION ?= aeda60d4361911da85103f224644bfa792498499
 
 #internal params
 DEVWORKSPACE_CTRL_SA=devworkspace-controller-serviceaccount
@@ -90,7 +89,6 @@ _print_vars:
 	@echo "    IMG=$(IMG)"
 	@echo "    PULL_POLICY=$(PULL_POLICY)"
 	@echo "    ROUTING_SUFFIX=$(ROUTING_SUFFIX)"
-	@echo "    WEBHOOK_ENABLED=$(WEBHOOK_ENABLED)"
 	@echo "    DEFAULT_ROUTING=$(DEFAULT_ROUTING)"
 	@echo "    DEVWORKSPACE_API_VERSION=$(DEVWORKSPACE_API_VERSION)"
 
@@ -103,7 +101,7 @@ _gen_configuration_env:
 ifeq ($(PLATFORM),kubernetes)
 	echo "export WEBHOOK_SECRET_NAME=devworkspace-operator-webhook-cert" >> $(RELATED_IMAGES_FILE)
 endif
-	cat ./config/components/manager/manager.yaml \
+	cat ./deploy/templates/components/manager/manager.yaml \
 		| yq -r \
 			'.spec.template.spec.containers[]?.env[] | select(.name | startswith("RELATED_IMAGE")) | "export \(.name)=\"$${\(.name):-\(.value)}\""' \
 		>> $(RELATED_IMAGES_FILE)
@@ -175,31 +173,21 @@ debug: _print_vars _gen_configuration_env _bump_kubeconfig _login_with_devworksp
 		WATCH_NAMESPACE=$(NAMESPACE) \
 		dlv debug --listen=:2345 --headless=true --api-version=2 ./main.go --
 
-### install_crds: Install CRDs into a cluster
-install_crds: _kustomize _init_devworkspace_crds
-	$(KUSTOMIZE) build config/crd | $(K8S_CLI) apply -f -
-
 ### install: Install controller in the configured Kubernetes cluster in ~/.kube/config
-install: _print_vars _kustomize _init_devworkspace_crds _create_namespace
-	mv config/cert-manager/kustomization.yaml config/cert-manager/kustomization.yaml.bak
-	mv config/service-ca/kustomization.yaml config/service-ca/kustomization.yaml.bak
-	mv config/base/config.properties config/base/config.properties.bak
-	mv config/base/manager_image_patch.yaml config/base/manager_image_patch.yaml.bak
-
-	envsubst < config/cert-manager/kustomization.yaml.bak > config/cert-manager/kustomization.yaml
-	envsubst < config/service-ca/kustomization.yaml.bak > config/service-ca/kustomization.yaml
-	envsubst < config/base/config.properties.bak > config/base/config.properties
-	envsubst < config/base/manager_image_patch.yaml.bak > config/base/manager_image_patch.yaml
+install: _print_vars _init_devworkspace_crds _create_namespace generate_deployment
 ifeq ($(PLATFORM),kubernetes)
-	$(KUSTOMIZE) build config/cert-manager | $(K8S_CLI) apply -f - || true
+	$(K8S_CLI) apply -f deploy/current/kubernetes/combined.yaml || true
 else
-	$(KUSTOMIZE) build config/service-ca | $(K8S_CLI) apply -f - || true
+	$(K8S_CLI) apply -f deploy/current/openshift/combined.yaml || true
 endif
 
-	mv config/cert-manager/kustomization.yaml.bak config/cert-manager/kustomization.yaml
-	mv config/service-ca/kustomization.yaml.bak config/service-ca/kustomization.yaml
-	mv config/base/config.properties.bak config/base/config.properties
-	mv config/base/manager_image_patch.yaml.bak config/base/manager_image_patch.yaml
+### generate_deployment: Generate files used for deployment from kustomize templates, using environment variables
+generate_deployment: _kustomize
+	deploy/generate-deployment.sh
+
+### generate_default_deployment: Generate files used for deployment from kustomize templates with default values
+generate_default_deployment: _kustomize
+	deploy/generate-deployment.sh --use-defaults
 
 ### install_plugin_templates: Deploy sample plugin templates to namespace devworkspace-plugins:
 install_plugin_templates: _print_vars
@@ -215,17 +203,19 @@ restart_webhook:
 	$(K8S_CLI) rollout restart -n $(NAMESPACE) deployment/devworkspace-webhook-server
 
 ### uninstall: Remove controller resources from the cluster
-uninstall: _kustomize
+uninstall: generate_deployment
 # It's safer to delete all workspaces before deleting the controller; otherwise we could
 # leave workspaces in a hanging state if we add finalizers.
 	$(K8S_CLI) delete devworkspaces.workspace.devfile.io --all-namespaces --all --wait || true
 	$(K8S_CLI) delete devworkspacetemplates.workspace.devfile.io --all-namespaces --all || true
 	$(K8S_CLI) delete workspaceroutings.controller.devfile.io --all-namespaces --all --wait || true
+
 ifeq ($(PLATFORM),kubernetes)
-	$(KUSTOMIZE) build config/cert-manager | $(K8S_CLI) delete --ignore-not-found -f -
+	$(K8S_CLI) delete --ignore-not-found -f deploy/current/kubernetes/combined.yaml || true
 else
-	$(KUSTOMIZE) build config/service-ca | $(K8S_CLI) delete --ignore-not-found -f -
+	$(K8S_CLI) delete --ignore-not-found -f deploy/current/openshift/combined.yaml || true
 endif
+
 	$(K8S_CLI) delete all -l "app.kubernetes.io/part-of=devworkspace-operator" --all-namespaces
 	$(K8S_CLI) delete mutatingwebhookconfigurations.admissionregistration.k8s.io controller.devfile.io --ignore-not-found
 	$(K8S_CLI) delete validatingwebhookconfigurations.admissionregistration.k8s.io controller.devfile.io --ignore-not-found
@@ -234,8 +224,8 @@ endif
 ### manifests: Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=role webhook paths="./..." \
-			output:crd:artifacts:config=config/crd/bases \
-			output:rbac:artifacts:config=config/components/rbac
+			output:crd:artifacts:config=deploy/templates/crd/bases \
+			output:rbac:artifacts:config=deploy/templates/components/rbac
 	patch/patch_crds.sh
 
 ### fmt: Run go fmt against code
@@ -359,5 +349,4 @@ help: Makefile
 	@echo '    KUBECONFIG                 - Kubeconfig which should be used for accessing to the cluster. Currently is: $(KUBECONFIG)'
 	@echo '    ROUTING_SUFFIX             - Cluster routing suffix (e.g. $$(minikube ip).nip.io, apps-crc.testing)'
 	@echo '    PULL_POLICY                - Image pull policy for controller'
-	@echo '    WEBHOOK_ENABLED            - Whether webhooks should be enabled in the deployment'
 	@echo '    DEVWORKSPACE_API_VERSION   - Branch or tag of the github.com/devfile/api to depend on. Defaults to master'
diff --git a/README.md b/README.md
@@ -68,7 +68,6 @@ The repository contains a Makefile; building and deploying can be configured via
 | `NAMESPACE` | Namespace to use for deploying controller | `devworkspace-controller` |
 | `ROUTING_SUFFIX` | Cluster routing suffix (e.g. `$(minikube ip).nip.io`, `apps-crc.testing`). Required for Kubernetes | `192.168.99.100.nip.io` |
 | `PULL_POLICY` | Image pull policy for controller | `Always` |
-| `WEBHOOK_ENABLED` | Whether webhooks should be enabled in the deployment | `false` |
 | `DEVWORKSPACE_API_VERSION` | Branch or tag of the github.com/devfile/api to depend on | `v1alpha1` | 
 
 Some of the rules supported by the makefile:

diff --git a/apis/controller/v1alpha1/common.go b/apis/controller/v1alpha1/common.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/apis/controller/v1alpha1/component.go b/apis/controller/v1alpha1/component.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/apis/controller/v1alpha1/component_types.go b/apis/controller/v1alpha1/component_types.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/apis/controller/v1alpha1/devfile.go b/apis/controller/v1alpha1/devfile.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/apis/controller/v1alpha1/doc.go b/apis/controller/v1alpha1/doc.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/apis/controller/v1alpha1/groupversion_info.go b/apis/controller/v1alpha1/groupversion_info.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/apis/controller/v1alpha1/runtime.go b/apis/controller/v1alpha1/runtime.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/apis/controller/v1alpha1/workspacerouting_types.go b/apis/controller/v1alpha1/workspacerouting_types.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/apis/controller/v1alpha1/zz_generated.deepcopy.go b/apis/controller/v1alpha1/zz_generated.deepcopy.go
diff --git a/controllers/controller/workspacerouting/predicates.go b/controllers/controller/workspacerouting/predicates.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/controller/workspacerouting/solvers/basic_solver.go b/controllers/controller/workspacerouting/solvers/basic_solver.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/controller/workspacerouting/solvers/cluster_solver.go b/controllers/controller/workspacerouting/solvers/cluster_solver.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/controller/workspacerouting/solvers/common.go b/controllers/controller/workspacerouting/solvers/common.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/controller/workspacerouting/solvers/oauth_proxy_container.go b/controllers/controller/workspacerouting/solvers/oauth_proxy_container.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/controller/workspacerouting/solvers/openshift_oauth_solver.go b/controllers/controller/workspacerouting/solvers/openshift_oauth_solver.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/controller/workspacerouting/solvers/resolve_endpoints.go b/controllers/controller/workspacerouting/solvers/resolve_endpoints.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/controller/workspacerouting/solvers/solver.go b/controllers/controller/workspacerouting/solvers/solver.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/controller/workspacerouting/solvers/sync_oauthclients.go b/controllers/controller/workspacerouting/solvers/sync_oauthclients.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/controller/workspacerouting/sync_ingresses.go b/controllers/controller/workspacerouting/sync_ingresses.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/controller/workspacerouting/sync_routes.go b/controllers/controller/workspacerouting/sync_routes.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/controller/workspacerouting/sync_services.go b/controllers/controller/workspacerouting/sync_services.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/controller/workspacerouting/workspacerouting_controller.go b/controllers/controller/workspacerouting/workspacerouting_controller.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/workspace/devworkspace_controller.go b/controllers/workspace/devworkspace_controller.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/workspace/env/common_env_vars.go b/controllers/workspace/env/common_env_vars.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/workspace/finalize.go b/controllers/workspace/finalize.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/workspace/predicates.go b/controllers/workspace/predicates.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/workspace/provision/data_types.go b/controllers/workspace/provision/data_types.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/workspace/provision/deployment.go b/controllers/workspace/provision/deployment.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/workspace/provision/object.go b/controllers/workspace/provision/object.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/workspace/provision/pvc.go b/controllers/workspace/provision/pvc.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/workspace/provision/rbac.go b/controllers/workspace/provision/rbac.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/

diff --git a/controllers/workspace/provision/routing.go b/controllers/workspace/provision/routing.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2020 Red Hat, Inc.
+// Copyright (c) 2019-2021 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/