Merge "Upgrade kpt to v1.0-beta"

manifests/function/flux/README.md

@@ -2,10 +2,12 @@
 
 ## How to Update
 
+##### Note: kpt version 1.0.0-beta.8 is required
+
 To update the version of upstream manifests used by a given function:
 
-1. Update the versions (git refs) specified in the `dependencies` section
-   of the Kptfile at the root of the function.
-2. Run [`kpt pkg sync .`](https://github.com/GoogleContainerTools/kpt/blob/master/site/content/en/reference/pkg/sync/_index.md) from the root of the function.
-3. Update any container image references in VariableCatalogues to match
-   these new versions.
+1. Update the git refs specified in the `upstream` section of the Kptfile in each of the function's `upstream` directory's subdirectories, e.g. `base/upstream/policies/Kptfile`.
+2. Save and commit the changes locally.
+3. Run [`kpt pkg update`](https://kpt.dev/reference/cli/pkg/update/) from the directory containing the modified Kptfile.
+4. After updating a package, all resulting changes must be committed before updating any additional package.
+5. Update any container image references in VariableCatalogues to match these new versions.

manifests/function/flux/base/Kptfile

@@ -1,13 +0,0 @@
-apiVersion: kpt.dev/v1alpha1
-kind: Kptfile
-dependencies:
-- name: upstream/rbac
-  git:
-    repo: "https://github.com/fluxcd/flux2"
-    directory: "manifests/rbac"
-    ref: "v0.5.1"
-- name: upstream/policies
-  git:
-    repo: "https://github.com/fluxcd/flux2"
-    directory: "manifests/policies"
-    ref: "v0.5.1"

manifests/function/flux/base/upstream/policies/Kptfile

@@ -1,20 +1,19 @@
-apiVersion: kpt.dev/v1alpha1
+apiVersion: kpt.dev/v1
 kind: Kptfile
+metadata:
+  name: policies
 upstream:
   type: git
   git:
+    repo: https://github.com/fluxcd/flux2
+    directory: manifests/policies
+    ref: v0.5.1
+  updateStrategy: resource-merge
+upstreamLock:
+  type: git
+  git:
+    repo: https://github.com/fluxcd/flux2
+    directory: manifests/policies
+    ref: v0.5.1
     commit: 0ba6fc1b366bd6f2ce231d3ac8a95eac57ff8554
-    repo: https://github.com/fluxcd/flux2
-    directory: manifests/policies
-    ref: v0.5.1
-dependencies:
-- name: upstream/rbac
-  git:
-    repo: https://github.com/fluxcd/flux2
-    directory: manifests/rbac
-    ref: v0.5.1
-- name: upstream/policies
-  git:
-    repo: https://github.com/fluxcd/flux2
-    directory: manifests/policies
-    ref: v0.5.1
+pipeline: {}

manifests/function/flux/base/upstream/rbac/Kptfile

@@ -1,20 +1,19 @@
-apiVersion: kpt.dev/v1alpha1
+apiVersion: kpt.dev/v1
 kind: Kptfile
+metadata:
+  name: rbac
 upstream:
   type: git
   git:
+    repo: https://github.com/fluxcd/flux2
+    directory: manifests/rbac
+    ref: v0.5.1
+  updateStrategy: resource-merge
+upstreamLock:
+  type: git
+  git:
+    repo: https://github.com/fluxcd/flux2
+    directory: manifests/rbac
+    ref: v0.5.1
     commit: 0ba6fc1b366bd6f2ce231d3ac8a95eac57ff8554
-    repo: https://github.com/fluxcd/flux2
-    directory: manifests/rbac
-    ref: v0.5.1
-dependencies:
-- name: upstream/rbac
-  git:
-    repo: https://github.com/fluxcd/flux2
-    directory: manifests/rbac
-    ref: v0.5.1
-- name: upstream/policies
-  git:
-    repo: https://github.com/fluxcd/flux2
-    directory: manifests/policies
-    ref: v0.5.1
+pipeline: {}

manifests/function/flux/helm-controller/Kptfile

@@ -1,13 +0,0 @@
-apiVersion: kpt.dev/v1alpha1
-kind: Kptfile
-dependencies:
-- name: upstream/crd
-  git:
-    repo: "https://github.com/fluxcd/helm-controller"
-    directory: "config/crd"
-    ref: "v0.11.1"
-- name: upstream/manager
-  git:
-    repo: "https://github.com/fluxcd/helm-controller"
-    directory: "config/manager"
-    ref: "v0.11.1"

manifests/function/flux/helm-controller/upstream/crd/Kptfile

@@ -1,20 +1,19 @@
-apiVersion: kpt.dev/v1alpha1
+apiVersion: kpt.dev/v1
 kind: Kptfile
+metadata:
+  name: crd
 upstream:
   type: git
   git:
-    commit: 9e983b746eb58201a46d8be77ddf58d903ce2e9d
     repo: https://github.com/fluxcd/helm-controller
     directory: config/crd
     ref: v0.11.1
-dependencies:
-- name: upstream/crd
+  updateStrategy: resource-merge
+upstreamLock:
+  type: git
   git:
     repo: https://github.com/fluxcd/helm-controller
     directory: config/crd
-    ref: v0.4.3
-- name: upstream/manager
-  git:
-    repo: https://github.com/fluxcd/helm-controller
-    directory: config/manager
-    ref: v0.4.3
+    ref: v0.11.1
+    commit: 9e983b746eb58201a46d8be77ddf58d903ce2e9d
+pipeline: {}

manifests/function/flux/helm-controller/upstream/manager/Kptfile

@@ -1,20 +1,19 @@
-apiVersion: kpt.dev/v1alpha1
+apiVersion: kpt.dev/v1
 kind: Kptfile
+metadata:
+  name: manager
 upstream:
   type: git
   git:
-    commit: 9e983b746eb58201a46d8be77ddf58d903ce2e9d
     repo: https://github.com/fluxcd/helm-controller
     directory: config/manager
     ref: v0.11.1
-dependencies:
-- name: upstream/crd
-  git:
-    repo: https://github.com/fluxcd/helm-controller
-    directory: config/crd
-    ref: v0.4.3
-- name: upstream/manager
+  updateStrategy: resource-merge
+upstreamLock:
+  type: git
   git:
     repo: https://github.com/fluxcd/helm-controller
     directory: config/manager
-    ref: v0.4.3
+    ref: v0.11.1
+    commit: 9e983b746eb58201a46d8be77ddf58d903ce2e9d
+pipeline: {}

manifests/function/flux/source-controller/Kptfile

@@ -1,13 +0,0 @@
-apiVersion: kpt.dev/v1alpha1
-kind: Kptfile
-dependencies:
-- name: upstream/crd
-  git:
-    repo: "https://github.com/fluxcd/source-controller"
-    directory: "config/crd"
-    ref: "v0.15.3"
-- name: upstream/manager
-  git:
-    repo: "https://github.com/fluxcd/source-controller"
-    directory: "config/manager"
-    ref: "v0.15.3"

manifests/function/flux/source-controller/upstream/crd/Kptfile

@@ -1,20 +1,19 @@
-apiVersion: kpt.dev/v1alpha1
+apiVersion: kpt.dev/v1
 kind: Kptfile
+metadata:
+  name: crd
 upstream:
   type: git
   git:
-    commit: 5c170bfdc3cfba2b34e2be543ef2b6f3630e873b
     repo: https://github.com/fluxcd/source-controller
     directory: config/crd
     ref: v0.15.3
-dependencies:
-- name: upstream/crd
+  updateStrategy: resource-merge
+upstreamLock:
+  type: git
   git:
     repo: https://github.com/fluxcd/source-controller
     directory: config/crd
-    ref: v0.5.2
-- name: upstream/manager
-  git:
-    repo: https://github.com/fluxcd/source-controller
-    directory: config/manager
-    ref: v0.5.2
+    ref: v0.15.3
+    commit: 5c170bfdc3cfba2b34e2be543ef2b6f3630e873b
+pipeline: {}

manifests/function/flux/source-controller/upstream/manager/Kptfile

@@ -1,20 +1,19 @@
-apiVersion: kpt.dev/v1alpha1
+apiVersion: kpt.dev/v1
 kind: Kptfile
+metadata:
+  name: manager
 upstream:
   type: git
   git:
-    commit: 5c170bfdc3cfba2b34e2be543ef2b6f3630e873b
     repo: https://github.com/fluxcd/source-controller
     directory: config/manager
     ref: v0.15.3
-dependencies:
-- name: upstream/crd
-  git:
-    repo: https://github.com/fluxcd/source-controller
-    directory: config/crd
-    ref: v0.5.2
-- name: upstream/manager
+  updateStrategy: resource-merge
+upstreamLock:
+  type: git
   git:
     repo: https://github.com/fluxcd/source-controller
     directory: config/manager
-    ref: v0.5.2
+    ref: v0.15.3
+    commit: 5c170bfdc3cfba2b34e2be543ef2b6f3630e873b
+pipeline: {}