Merge remote-tracking branch 'origin/develop'

kustomize/app/deployment.yaml

@@ -1,24 +1,12 @@
 ---
-apiVersion: argoproj.io/v1alpha1
+apiVersion: v1
-kind: Rollout
+kind: Service
 metadata:
   name: kipunji
   annotations:
     reloader.stakater.com/auto: "true"
 spec:
   replicas: 5
-  strategy:
-    canary:
-      steps:
-      - setWeight: 20
-      - pause: {}
-      - setWeight: 40
-      - pause: {duration: 10}
-      - setWeight: 60
-      - pause: {duration: 10}
-      - setWeight: 80
-      - pause: {duration: 10}
-  revisionHistoryLimit: 2
   selector:
     matchLabels:
       app: kipunji

kustomize/app/kustomization.yaml

@@ -5,6 +5,6 @@ namespace: kipunji
 resources:
   - secret.yaml
   - configmap.yaml
-  - rollout.yaml
+  - deployment.yaml
   - services.yaml
   - ingress.yaml