Merge branch 'master' into master

apps/templates/helm-hooks.yaml

@@ -14,3 +14,4 @@ spec:
     path: helm-hooks
     repoURL: {{ .Values.spec.source.repoURL }}
     targetRevision: {{ .Values.spec.source.targetRevision }}
+

guestbook/guestbook-ui-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: guestbook-ui

helm-guestbook/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "helm-guestbook.fullname" . }}

jsonnet-guestbook-tla/guestbook-ui.jsonnet

@@ -27,7 +27,7 @@ function (
         }
     },
     {
-        "apiVersion": "apps/v1beta2",
+        "apiVersion": "apps/v1",
         "kind": "Deployment",
         "metadata": {
             "name": name
@@ -62,4 +62,4 @@ function (
             }
         }
     }
-    ]
+    ]

jsonnet-guestbook/guestbook-ui.jsonnet

@@ -21,7 +21,7 @@ local params = import 'params.libsonnet';
       }
    },
    {
-      "apiVersion": "apps/v1beta2",
+      "apiVersion": "apps/v1",
       "kind": "Deployment",
       "metadata": {
          "name": params.name

ksonnet-guestbook/components/guestbook-ui.jsonnet

@@ -21,7 +21,7 @@ local params = std.extVar("__ksonnet/params").components["guestbook-ui"];
       }
    },
    {
-      "apiVersion": "apps/v1beta2",
+      "apiVersion": "apps/v1",
       "kind": "Deployment",
       "metadata": {
          "name": params.name

kustomize-guestbook/guestbook-ui-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: guestbook-ui

plugins/kustomized-helm/overlays/guestbook-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: release-name-helm-guestbook

pre-post-sync/kustomization.yaml

@@ -1,7 +1,8 @@
 namePrefix: pre-post-sync-
 
+bases:
+- ../kustomize-guestbook
+
 resources:
-- ../guestbook/guestbook-ui-deployment.yaml
-- ../guestbook/guestbook-ui-svc.yaml
 - pre-sync-job.yaml
 - post-sync-job.yaml