Merge pull request #1120 from praveenrewar/update-package-values

Expose values in kapp-controller package

Author: rohitagg2020

.github/workflows/kind-action.yml

@@ -38,7 +38,7 @@ jobs:
 
           source ./hack/version-util.sh
 
-          ytt -f config -f config-dev -v dev.version="$(get_kappctrl_ver)+develop" | kbld -f- > kbld.out 2> kbldmeta.out
+          ytt -f config/config -f config/values-schema.yml -f config-dev -v dev.version="$(get_kappctrl_ver)+develop" | kbld -f- > kbld.out 2> kbldmeta.out
           cat kbldmeta.out | tail -n 1 | sed 's/.*final: kapp-controller -> \(.*\)$/\1/p'  | tail -n 1 | xargs kind load docker-image --name kinder
           kapp deploy -a kc -f kbld.out -c -y
 

config/0-namespace.yml renamed to config/config/0-namespace.yml

@@ -4,16 +4,16 @@
 #! has Namespace first so that kubectl can can install kc
 #! (kapp of course perm automatic ordering)
 
-#@ if/end data.values.namespace != "default" and data.values.create_namespace:
+#@ if/end data.values.namespace != "default" and data.values.createNamespace:
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
   name: #@ data.values.namespace
 
-#@ if/end data.values.packaging_global_namespace != "" and data.values.create_packaging_namespace:
+#@ if/end data.values.packagingGlobalNamespace != "" and data.values.createPackagingNamespace:
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: #@ data.values.packaging_global_namespace
+  name: #@ data.values.packagingGlobalNamespace

config/agg-api.yml renamed to config/config/agg-api.yml

@@ -23,11 +23,11 @@ spec:
       - name: kapp-controller
         image: kapp-controller
         args:
-        - #@ "-packaging-global-namespace={}".format(data.values.packaging_global_namespace)
-        #@ if/end data.values.dangerous_enable_pprof:
+        - #@ "-packaging-global-namespace={}".format(data.values.packagingGlobalNamespace)
+        #@ if/end data.values.dangerousEnablePprof:
         - -dangerous-enable-pprof=true
-        - #@ "-enable-api-priority-and-fairness={}".format(data.values.enable_api_priority_and_fairness)
-        - #@ "-tls-cipher-suites={}".format(data.values.tls_cipher_suites)
+        - #@ "-enable-api-priority-and-fairness={}".format(data.values.enableApiPriorityAndFairness)
+        - #@ "-tls-cipher-suites={}".format(data.values.tlsCipherSuites)
         env:
         - name: KAPPCTRL_MEM_TMP_DIR
           value: /etc/kappctrl-mem-tmp
@@ -38,7 +38,7 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         - name: KAPPCTRL_API_PORT
-          value: #@ str(data.values.api_port)
+          value: #@ str(data.values.apiPort)
         resources:
           requests:
             cpu: 120m
@@ -49,7 +49,7 @@ spec:
         - name: home
           mountPath: /home/kapp-controller
         ports:
-        - containerPort: #@ data.values.api_port
+        - containerPort: #@ data.values.apiPort
           name: api
           protocol: TCP
         securityContext:
@@ -96,7 +96,7 @@ spec:
       - name: empty-sa
         emptyDir: {}
 
-#@ if/end data.values.dangerous_enable_pprof:
+#@ if/end data.values.dangerousEnablePprof:
 ---
 apiVersion: v1
 kind: Service

config/crds.yml renamed to config/config/crds.yml

@@ -63,7 +63,7 @@ rules:
 - apiGroups: ["authorization.k8s.io"]
   resources: ["subjectaccessreviews"]
   verbs: ["create"]
-#@ if/end data.values.enable_api_priority_and_fairness:
+#@ if/end data.values.enableApiPriorityAndFairness:
 - apiGroups: ["flowcontrol.apiserver.k8s.io"]
   resources: ["prioritylevelconfigurations", "flowschemas"]
   verbs: ["list", "watch"]

config/deployment.yml renamed to config/config/deployment.yml

@@ -0,0 +1,14 @@
+#@ load("@ytt:overlay", "overlay")
+#@ load("@ytt:data", "data")
+
+#@overlay/match by=overlay.subset({"kind":"Deployment","metadata":{"name": "kapp-controller"}})
+#@overlay/insert before=True
+---
+#! This optional Secret must be created before the kapp-controller pod launches in order to read it.
+apiVersion: v1
+kind: Secret
+metadata:
+  #! Name must be `kapp-controller-config` for kapp controller to pick it up
+  name: kapp-controller-config
+  namespace: #@ data.values.namespace
+stringData: #@ data.values.config

config/rbac.yml renamed to config/config/rbac.yml

@@ -0,0 +1,9 @@
+#@ load("@ytt:overlay", "overlay")
+#@ load("@ytt:data", "data")
+
+#@overlay/match by=overlay.subset({"metadata":{"name":"packagerepositories.packaging.carvel.dev"}})
+---
+metadata:
+  #@overlay/match missing_ok=True
+  annotations:
+    packaging.carvel.dev/global-namespace: #@ data.values.packagingGlobalNamespace

config/overlays/controller-config-overlay.yml

@@ -0,0 +1,69 @@
+#@ load("@ytt:overlay", "overlay")
+#@ load("@ytt:data", "data")
+#@ load("@ytt:yaml", "yaml")
+
+#@ def is_toleration_specified(toleration):
+#@   return toleration in yaml.decode(yaml.encode(data.values.tolerations))
+#@ end
+
+#@ default_tolerations = []
+#@ is_primary_specified = is_toleration_specified({"effect":"NoSchedule", "key":"node-role.kubernetes.io/master"})
+#@ is_control_specified = is_toleration_specified({"effect":"NoSchedule", "key":"node-role.kubernetes.io/control-plane"})
+
+#@ if is_primary_specified and not is_control_specified:
+#@   default_tolerations += [{"effect":"NoSchedule", "key":"node-role.kubernetes.io/control-plane"}]
+#@ end
+
+#@overlay/match by=overlay.subset({"kind":"Deployment","metadata":{"name": "kapp-controller"}})
+---
+spec:
+  template:
+    #@overlay/match-child-defaults missing_ok=True
+    spec:
+      containers:
+      #@overlay/match by=overlay.subset({"name":"kapp-controller"})
+      - args:
+        #@overlay/append
+        - #@ "-concurrency={}".format(data.values.concurrency)
+        #@overlay/append
+        - #@ "-metrics-bind-address={}".format(data.values.metricsBindAddress)
+
+      #@overlay/match by=overlay.subset({"name":"kapp-controller-sidecarexec"})
+      -
+        #@ if/end data.values.coreDNSIP:
+        volumeMounts:
+          - mountPath: /etc
+            name: etc
+
+      #@ if data.values.coreDNSIP:
+      #! Using init container bypasses the restriction of not having root access in main container
+      #! It modifies /etc/resolv.conf which is shared to main container
+      initContainers:
+      - args:
+        - -c
+        - #@ "cp /etc/resolv.conf /etc/resolv.conf.bak; sed '1 i nameserver " + data.values.coreDNSIP + "' /etc/resolv.conf.bak > /etc/resolv.conf; rm /etc/resolv.conf.bak; cp -R /etc/* /kapp-etc; chmod g+w /kapp-etc/pki/tls/certs/"
+        command:
+        - /bin/sh
+        image: kapp-controller
+        name: init-kapp-controller
+        securityContext:
+          allowPrivilegeEscalation: false
+          runAsUser: 0
+        volumeMounts:
+        - mountPath: /kapp-etc
+          name: etc
+      #@ end
+      #@ if/end data.values.hostNetwork:
+      hostNetwork: #@ data.values.hostNetwork
+      #@ if/end data.values.priorityClassName:
+      priorityClassName: #@ data.values.priorityClassName
+      #@ if hasattr(data.values, 'tolerations') and data.values.tolerations:
+      tolerations: #@ default_tolerations + data.values.tolerations
+      #@ end
+      #@ if data.values.coreDNSIP:
+      volumes:
+        #@overlay/append
+        - emptyDir:
+            medium: Memory
+          name: etc
+      #@ end

config/overlays/crd-overlay.yml

@@ -0,0 +1,63 @@
+#@ load("@ytt:overlay", "overlay")
+#@ load("@ytt:data", "data")
+
+#@ def matcher():
+kind: Deployment
+metadata:
+  name: kapp-controller
+spec:
+  template:
+    spec:
+      nodeSelector:
+        node-role.kubernetes.io/master: ""
+#@ end
+
+#@overlay/match expects="0+",by=overlay.subset({"kind":"Deployment"})
+---
+kind: Deployment
+spec:
+  #@ if data.values.deployment.updateStrategy:
+  #@overlay/match missing_ok=True
+  strategy:
+    type: #@ data.values.deployment.updateStrategy
+    #@overlay/match missing_ok=True
+    #@ if data.values.deployment.updateStrategy == "RollingUpdate":
+    rollingUpdate:
+      #@ if/end data.values.deployment.rollingUpdate.maxUnavailable != None:
+      maxUnavailable: #@ data.values.deployment.rollingUpdate.maxUnavailable
+      #@ if/end data.values.deployment.rollingUpdate.maxSurge != None:
+      maxSurge: #@ data.values.deployment.rollingUpdate.maxSurge
+    #@ end
+  #@ end
+  #@ if data.values.nodeSelector != None:
+  template:
+    spec:
+      #@overlay/match missing_ok=True
+      nodeSelector:
+        #@ for key in data.values.nodeSelector:
+        #@overlay/match missing_ok=True
+        #@yaml/text-templated-strings
+        (@= key @): #@ data.values.nodeSelector[key]
+        #@ end
+  #@ end
+
+#@overlay/match expects="0+",by=overlay.subset({"kind":"DaemonSet"})
+---
+kind: DaemonSet
+spec:
+  #@ if data.values.daemonset.updateStrategy:
+  #@overlay/match missing_ok=True
+  updateStrategy:
+    type: #@ data.values.daemonset.updateStrategy
+  #@ end
+
+#@overlay/match by=overlay.subset(matcher()) , when=1
+---
+spec:
+  template:
+    spec:
+      nodeSelector:
+        #@overlay/remove
+        node-role.kubernetes.io/master:
+        #@overlay/match missing_ok=True
+        node-role.kubernetes.io/control-plane: ""