Merge "Add generate openAPIV3Schema schema for DaemonJob CRD."

daemonjob-controller/templates/composite-controller.yaml

@@ -27,6 +27,8 @@ spec:
   childResources:
     - apiVersion: apps/v1
       resource: daemonsets
+      updateStrategy:
+        method: InPlace
   hooks:
     sync:
       webhook:

daemonjob-controller/values.yaml

@@ -19,7 +19,7 @@ release_group: null
 
 images:
   tags:
-    python: docker.io/python:3.6-slim
+    python: docker.io/python:3.7-slim
     pause: gcr.io/google_containers/pause:latest
     image_repo_sync: docker.io/docker:17.07.0
   pullPolicy: IfNotPresent

metacontroller/templates/crds.yaml

@@ -274,6 +274,12 @@ spec:
     shortNames:
     - cc
     - cctl
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

metacontroller/values.yaml

@@ -19,7 +19,7 @@ release_group: null
 
 images:
   tags:
-    metacontroller: docker.io/metacontroller/metacontroller:v0.4.0
+    metacontroller: metacontrollerio/metacontroller:v0.4.2
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: IfNotPresent

tools/deployment/common/daemonjob-controller.sh

@@ -22,6 +22,7 @@ make daemonjob-controller
 #NOTE: Deploy command
 helm upgrade --install daemonjob-controller ./daemonjob-controller \
     --namespace=$namespace \
+    --set pod.replicas.daemonjob_controller=4 \
     ${HELM_ARGS_DAEMONJOB_CONTROLLER}
 
 #NOTE: Wait for deploy
@@ -78,7 +79,7 @@ spec:
         resources:
           requests:
             cpu: 10m
-    terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 10
 EOF
 
 dj="daemonjobs"