Update different configs to better dev experience

Author: lwolf

Makefile

@@ -3,6 +3,7 @@ VERSION ?= $(shell git describe --tags --always --dirty="-dev")
 IMG ?= quay.io/lwolf/konsumerator:$(VERSION)
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true"
+KUBECTL ?= "kubectl"
 
 # for some reason travis-ci calls `make` on each step which triggers download
 # of all packages. This check disables it.
@@ -29,12 +30,12 @@ run: generate fmt vet
 
 # Install CRDs into a cluster
 install: manifests
-	kubectl apply -f config/crd/bases
+	${KUBECTL} apply -f config/crd/bases
 
 # Deploy controller in the configured Kubernetes cluster in ~/.kube/config
 deploy: manifests
-	kubectl apply -f config/crd/bases
-	kustomize build config/default | kubectl apply -f -
+	#$(KUBECTL) apply -f config/crd/bases
+	kustomize build config/default | $(KUBECTL) apply -f -
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: bin/controller-gen
@@ -82,8 +83,8 @@ kind-load-image:
 kind-update: docker-build kind-load-image deploy
 
 kind-apply:
-	kubectl --context=kind-konsumerator apply -f ./hack/ci/prom.yaml -n kube-system
-	kubectl --context=kind-konsumerator apply -f ./hack/ci/konsumerator-dashboard.yaml -n kube-system
-	kubectl --context=kind-konsumerator apply -f ./hack/ci/konsumerator-overview-dashboard.yaml -n kube-system
-	kubectl --context=kind-konsumerator apply -f ./hack/ci/grafana.yaml -n kube-system
+	$(KUBECTL) --context=kind-konsumerator apply -f ./hack/ci/prom.yaml -n kube-system
+	$(KUBECTL) --context=kind-konsumerator apply -f ./hack/ci/konsumerator-dashboard.yaml -n kube-system
+	$(KUBECTL) --context=kind-konsumerator apply -f ./hack/ci/konsumerator-overview-dashboard.yaml -n kube-system
+	$(KUBECTL) --context=kind-konsumerator apply -f ./hack/ci/grafana.yaml -n kube-system
 

config/manager/manager.yaml

@@ -25,7 +25,7 @@ spec:
       containers:
       - name: manager
         args:
-        - --enable-leader-election
+        - --namespace=konsumerator-system
         image: controller:latest
         resources:
           limits:

config/rbac/leader_election_role.yaml

@@ -16,6 +16,18 @@ rules:
   - update
   - patch
   - delete
+- apiGroups:
+    - coordination.k8s.io
+  resources:
+    - leases
+  verbs:
+    - get
+    - list
+    - watch
+    - create
+    - update
+    - patch
+    - delete
 - apiGroups:
   - ""
   resources:

controllers/utils.go

@@ -126,7 +126,9 @@ func UpdateStatusAnnotations(cm *corev1.ConfigMap, status *konsumeratorv1.Consum
 	cm.Annotations[annotationStatusLagging] = fmt.Sprintf("%d", *status.Lagging)
 	cm.Annotations[annotationStatusMissing] = fmt.Sprintf("%d", *status.Missing)
 	cm.Annotations[annotationStatusOutdated] = fmt.Sprintf("%d", *status.Outdated)
-	cm.Annotations[annotationStatusLastSyncTime] = status.LastSyncTime.Format(helpers.TimeLayout)
+	if !status.LastSyncTime.IsZero() {
+		cm.Annotations[annotationStatusLastSyncTime] = status.LastSyncTime.Format(helpers.TimeLayout)
+	}
 	state, err := json.Marshal(status.LastSyncState)
 	if err != nil {
 		return err

hack/ci/consumer-test-configmap.yaml

@@ -8,7 +8,7 @@ data:
   consumer.yaml: |
     numPartitions: 10
     name: "test-consumer"
-    namespace: "consumer-test"
+    namespace: "konsumerator-system"
     autoscaler:
       # mode could be vpa or prometheus.
       # `prometheus` is configured using prometheus provider and user specific metrics
@@ -35,7 +35,7 @@ data:
         recoveryTime: "30m"
         # prometheus addresses to query
         address:
-          - "http://172.17.0.3:30666"
+          - "http://prometheus-server.kube-system:9090"
         # Offset query should return number of messages that is not
         # processed yet a.k.a lag per partitionLabel
         offset:

hack/ci/consumer-test.yaml

@@ -6,7 +6,7 @@ spec:
   numPartitions: 2
   numPartitionsPerInstance: 2
   name: "test-consumer"
-  namespace: "default"
+  namespace: "konsumerator-system"
   autoscaler:
     # mode could be vpa or prometheus.
     # `prometheus` is configured using prometheus provider and user specific metrics
@@ -34,8 +34,6 @@ spec:
       # prometheus addresses to query
       address:
         - "http://prometheus-server.kube-system:9090"
-        - "http://172.17.0.1:30666"
-        - "http://172.17.0.3:30666"
       # Offset query should return number of messages that is not
       # processed yet a.k.a lag per partitionLabel
       offset:
@@ -108,7 +106,6 @@ spec:
         cpu: "1"
         memory: "100M"
     - containerName: busybox-info
-#      mode: Off
       minAllowed:
         cpu: "100m"
         memory: "100M"