Introduce devel mode for controlling log level (#529)

* Build images with clean git state

* Remove excessive `requires` references

The deploy order is kept even if `requires` is not set.
However, `requires` causes more modules to be deployed than selected.

* Drop default `--zap-log-level=info`

Dropping the flag with its default value makes it easier to overwrite.

* Drop default zap devel, use instead of log level

* Add explicit devel mode

Author: timebertt

.gitignore

@@ -2,6 +2,7 @@
 .envrc
 hack/kind_kubeconfig.yaml
 .gitguardian.yaml
+.ko.yaml
 
 # Binaries for programs and plugins
 *.exe

.run/shard (kind).run.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="checksum-controller (kind)" type="GoApplicationRunConfiguration" factoryName="Go Application">
     <module name="kubernetes-controller-sharding" />
     <working_directory value="$PROJECT_DIR$" />
-    <parameters value="--zap-log-level=debug --shard-name=checksum-controller-host --lease-namespace=default" />
+    <parameters value="--zap-devel --shard-name=checksum-controller-host --lease-namespace=default" />
     <envs>
       <env name="KUBECONFIG" value="$PROJECT_DIR$/hack/kind_kubeconfig.yaml" />
     </envs>

.run/sharder (kind).run.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="sharder (kind)" type="GoApplicationRunConfiguration" factoryName="Go Application">
     <module name="kubernetes-controller-sharding" />
     <working_directory value="$PROJECT_DIR$" />
-    <parameters value="--config=hack/config/sharder/host/config.yaml --zap-log-level=debug" />
+    <parameters value="--config=hack/config/sharder/host/config.yaml --zap-devel" />
     <envs>
       <env name="LEADER_ELECT" value="false" />
       <env name="KUBECONFIG" value="$PROJECT_DIR$/hack/kind_kubeconfig.yaml" />

Makefile

@@ -140,14 +140,14 @@ run: $(KUBECTL) generate-fast ## Run the sharder from your host and deploy prere
 	$(MAKE) deploy SKAFFOLD_MODULE=cert-manager
 	$(KUBECTL) apply --server-side --force-conflicts -k config/crds
 	$(KUBECTL) apply --server-side --force-conflicts -k hack/config/certificates/host
-	go run ./cmd/sharder --config=hack/config/sharder/host/config.yaml --zap-log-level=debug
+	go run ./cmd/sharder --config=hack/config/sharder/host/config.yaml --zap-devel
 
 SHARD_NAME ?= checksum-controller-$(shell tr -dc bcdfghjklmnpqrstvwxz2456789 </dev/urandom | head -c 8)
 
 .PHONY: run-checksum-controller
 run-checksum-controller: $(KUBECTL) ## Run checksum-controller from your host and deploy prerequisites.
 	$(KUBECTL) apply --server-side --force-conflicts -k hack/config/checksum-controller/controllerring
-	go run ./cmd/checksum-controller --shard-name=$(SHARD_NAME) --lease-namespace=default --zap-log-level=debug
+	go run ./cmd/checksum-controller --shard-name=$(SHARD_NAME) --lease-namespace=default --zap-devel
 
 PUSH ?= false
 images: export KO_DOCKER_REPO = $(GHCR_REPO)

cmd/checksum-controller/main.go

@@ -88,7 +88,6 @@ type options struct {
 func newOptions() *options {
 	return &options{
 		zapOptions: &zap.Options{
-			Development: true,
 			TimeEncoder: zapcore.ISO8601TimeEncoder,
 		},
 

cmd/sharder/app/options.go

@@ -63,7 +63,6 @@ type options struct {
 func newOptions() *options {
 	return &options{
 		zapOptions: &zap.Options{
-			Development: true,
 			TimeEncoder: zapcore.ISO8601TimeEncoder,
 		},
 	}

config/sharder/deployment.yaml

@@ -22,7 +22,6 @@ spec:
       - name: sharder
         image: sharder:latest
         args:
-        - --zap-log-level=info
         - --config=/config.yaml
         volumeMounts:
         - name: config

hack/config/checksum-controller/controller/deployment.yaml

@@ -13,7 +13,7 @@ spec:
       - name: checksum-controller
         image: checksum-controller:latest
         args:
-        - --zap-log-level=debug
+        - --zap-devel
         env:
         - name: DISABLE_HTTP2
           value: "true"

hack/config/sharder/local/kustomization.yaml renamed to hack/config/sharder/devel/kustomization.yaml

@@ -11,9 +11,6 @@ patches:
     name: sharder
     namespace: sharding-system
   patch: |
-    - op: test
-      path: /spec/template/spec/containers/0/args/0
-      value: --zap-log-level=info
-    - op: replace
-      path: /spec/template/spec/containers/0/args/0
-      value: --zap-log-level=debug
+    - op: add
+      path: /spec/template/spec/containers/0/args/-
+      value: --zap-devel

hack/config/skaffold.yaml

@@ -172,9 +172,6 @@ apiVersion: skaffold/v4beta12
 kind: Config
 metadata:
   name: sharder
-requires:
-  - configs:
-      - policy
 build:
   artifacts:
     - image: ghcr.io/timebertt/kubernetes-controller-sharding/sharder
@@ -208,21 +205,19 @@ deploy:
         - --force-conflicts
     defaultNamespace: ""
 profiles:
-  - name: kind
+  - name: devel
     activation:
       - kubeContext: kind-.*
+      - env: DEVEL=true
     patches:
       - op: replace
         path: /manifests/kustomize/paths/0
-        value: hack/config/sharder/local
+        value: hack/config/sharder/devel
 ---
 apiVersion: skaffold/v4beta12
 kind: Config
 metadata:
   name: checksum-controller
-requires:
-  - configs:
-      - policy
 build:
   artifacts:
     - image: ghcr.io/timebertt/kubernetes-controller-sharding/checksum-controller
@@ -342,10 +337,6 @@ apiVersion: skaffold/v4beta12
 kind: Config
 metadata:
   name: webhosting-operator
-requires:
-  - configs:
-      - policy
-      - monitoring-crds
 build:
   artifacts:
     - image: ghcr.io/timebertt/kubernetes-controller-sharding/webhosting-operator
@@ -382,6 +373,14 @@ deploy:
               - make
               - generate-fast-webhosting
 profiles:
+  - name: devel
+    activation:
+      - kubeContext: kind-.*
+      - env: DEVEL=true
+    patches:
+      - op: replace
+        path: /manifests/kustomize/paths/0
+        value: webhosting-operator/config/manager/overlays/devel
   - name: debug
     activation:
       - command: debug
@@ -403,26 +402,47 @@ profiles:
     patches:
       - op: replace
         path: /manifests/kustomize/paths/0
-        # default configuration: only run operator shards and use external sharding implementation via ControllerRing
+        # default configuration: run sharded operator and use external sharding implementation via ControllerRing
         value: webhosting-operator/config/manager/overlays/shoot/default
       - op: add
         path: /manifests/kustomize/paths/-
         value: webhosting-operator/config/policy
+  - name: shoot-devel
+    requiresAllActivations: true
+    activation:
+      - kubeContext: .*--sharding.*
+      - env: DEVEL=true
+    patches:
+      - op: replace
+        path: /manifests/kustomize/paths/0
+        # default configuration + devel mode
+        value: webhosting-operator/config/manager/overlays/shoot/devel
   - name: shoot-non-sharded
+    requiresAllActivations: true
+    activation:
+      - kubeContext: .*--sharding.*
+      - env: ENABLE_SHARDING=false
     patches:
       - op: replace
         path: /manifests/kustomize/paths/0
         # singleton controller without sharding for comparison
         value: webhosting-operator/config/manager/overlays/shoot/non-sharded
+  - name: shoot-non-sharded-devel
+    requiresAllActivations: true
+    activation:
+      - kubeContext: .*--sharding.*
+      - env: ENABLE_SHARDING=false
+      - env: DEVEL=true
+    patches:
+      - op: replace
+        path: /manifests/kustomize/paths/0
+        # non-sharded configuration + devel mode
+        value: webhosting-operator/config/manager/overlays/shoot/non-sharded-devel
 ---
 apiVersion: skaffold/v4beta12
 kind: Config
 metadata:
   name: experiment
-requires:
-  - configs:
-      - policy
-      - monitoring-crds
 profiles:
   - name: expirement
     activation: