Rebased against main

pkg/registry/porch/watch.go

@@ -238,9 +238,6 @@ func (w *watcher) sendWatchEvent(ev watch.Event) {
 	// TODO: Handle the case that the watch channel is full?
 	w.resultChan <- ev
 	w.totalSent += 1
-	if (w.totalSent % 100) == 0 {
-		klog.Infof("watch %p: total sent: %d", w, w.totalSent)
-	}
 }
 
 // OnPackageRevisionChange is the callback called when a PackageRevision changes.

pkg/repository/testdata/update/local/Kptfile

@@ -0,0 +1,27 @@
+apiVersion: kpt.dev/v1
+kind: Kptfile
+metadata:
+  name: backend
+  annotations:
+    config.kubernetes.io/local-config: "true"
+upstream:
+  type: git
+  git:
+    repo: https://github.com/droot/pkg-catalog.git
+    directory: basens
+    ref: basens/v0
+upstreamLock:
+  type: git
+  git:
+    repo: https://github.com/droot/pkg-catalog.git
+    directory: basens
+    ref: basens/v0
+    commit: b3e1d439516a5e8d49adc0c82d3e95578570dbfa
+info:
+  description: kpt package for provisioning namespace
+pipeline:
+  mutators:
+  - image: gcr.io/kpt-fn/set-namespace:v0.3.4
+    configPath: package-context.yaml
+  - image: gcr.io/kpt-fn/apply-replacements:v0.1.0
+    configPath: update-rolebinding.yaml

pkg/repository/testdata/update/local/README.md

@@ -0,0 +1,21 @@
+# basens
+
+## Description
+kpt package for provisioning namespace
+
+## Usage
+
+### Fetch the package
+`kpt pkg get REPO_URI[.git]/PKG_PATH[@VERSION] basens`
+Details: https://kpt.dev/reference/cli/pkg/get/
+
+### View package content
+`kpt pkg tree basens`
+Details: https://kpt.dev/reference/cli/pkg/tree/
+
+### Apply the package
+```
+kpt live init basens
+kpt live apply basens --reconcile-timeout=2m --output=table
+```
+Details: https://kpt.dev/reference/cli/live/

pkg/repository/testdata/update/local/namespace.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: Namespace
+metadata: # kpt-merge: example
+  name: backend
+spec: {}

pkg/repository/testdata/update/local/package-context.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kptfile.kpt.dev
+  annotations:
+    config.kubernetes.io/local-config: "true"
+data:
+  name: backend

pkg/repository/testdata/update/local/resourcequota.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ResourceQuota
+metadata: # kpt-merge: example/default
+  name: default
+  namespace: backend
+spec:
+  hard:
+    cpu: "40"
+    memory: 40G

pkg/repository/testdata/update/local/rolebinding.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata: # kpt-merge: example/app-admin
+  name: app-admin
+  namespace: backend
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: app-admin
+subjects:
+- apiGroup: rbac.authorization.k8s.io
+  kind: Group
+  name: backend.admin@bigco.com

pkg/repository/testdata/update/local/update-rolebinding.yaml

@@ -0,0 +1,20 @@
+apiVersion: fn.kpt.dev/v1alpha1
+kind: ApplyReplacements
+metadata: # kpt-merge: example/update-rolebinding
+  name: update-rolebinding
+  annotations:
+    config.kubernetes.io/local-config: "true"
+replacements:
+- source:
+    kind: ConfigMap
+    name: kptfile.kpt.dev
+    fieldPath: data.name
+  targets:
+  - select:
+      name: app-admin
+      kind: RoleBinding
+    fieldPaths:
+    - subjects.[kind=Group].name
+    options:
+      delimiter: '.'
+      index: 0

pkg/repository/testdata/update/original/Kptfile

@@ -0,0 +1,14 @@
+apiVersion: kpt.dev/v1
+kind: Kptfile
+metadata:
+  name: basens
+  annotations:
+    config.kubernetes.io/local-config: "true"
+info:
+  description: kpt package for provisioning namespace
+pipeline:
+  mutators:
+    - image: gcr.io/kpt-fn/set-namespace:v0.3.4
+      configPath: package-context.yaml
+    - image: gcr.io/kpt-fn/apply-replacements:v0.1.0
+      configPath: update-rolebinding.yaml

pkg/repository/testdata/update/original/README.md

@@ -0,0 +1,21 @@
+# basens
+
+## Description
+kpt package for provisioning namespace
+
+## Usage
+
+### Fetch the package
+`kpt pkg get REPO_URI[.git]/PKG_PATH[@VERSION] basens`
+Details: https://kpt.dev/reference/cli/pkg/get/
+
+### View package content
+`kpt pkg tree basens`
+Details: https://kpt.dev/reference/cli/pkg/tree/
+
+### Apply the package
+```
+kpt live init basens
+kpt live apply basens --reconcile-timeout=2m --output=table
+```
+Details: https://kpt.dev/reference/cli/live/

pkg/repository/testdata/update/original/namespace.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: example
+spec: {}

pkg/repository/testdata/update/original/package-context.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kptfile.kpt.dev
+  annotations:
+    config.kubernetes.io/local-config: "true"
+data:
+  name: example

pkg/repository/testdata/update/original/resourcequota.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ResourceQuota
+metadata:
+  name: default
+  namespace: example
+spec:
+  hard:
+    cpu: "40"
+    memory: 40G

pkg/repository/testdata/update/original/rolebinding.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: app-admin
+  namespace: example
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: app-admin
+subjects:
+- apiGroup: rbac.authorization.k8s.io
+  kind: Group
+  name: example.admin@bigco.com

pkg/repository/testdata/update/original/update-rolebinding.yaml

@@ -0,0 +1,20 @@
+apiVersion: fn.kpt.dev/v1alpha1
+kind: ApplyReplacements
+metadata:
+  name: update-rolebinding
+  annotations:
+    config.kubernetes.io/local-config: "true"
+replacements:
+- source:
+    kind: ConfigMap
+    name: kptfile.kpt.dev
+    fieldPath: data.name
+  targets:
+  - select:
+      name: app-admin
+      kind: RoleBinding
+    fieldPaths:
+    - subjects.[kind=Group].name
+    options:
+      delimiter: '.'
+      index: 0

pkg/repository/testdata/update/updated/Kptfile

@@ -0,0 +1,27 @@
+apiVersion: kpt.dev/v1
+kind: Kptfile
+metadata:
+  name: backend
+  annotations:
+    config.kubernetes.io/local-config: "true"
+upstream:
+  type: git
+  git:
+    repo: https://github.com/droot/pkg-catalog.git
+    directory: basens
+    ref: basens/v0
+upstreamLock:
+  type: git
+  git:
+    repo: https://github.com/droot/pkg-catalog.git
+    directory: basens
+    ref: basens/v0
+    commit: b3e1d439516a5e8d49adc0c82d3e95578570dbfa
+info:
+  description: kpt package for provisioning namespace
+pipeline:
+  mutators:
+  - image: gcr.io/kpt-fn/set-namespace:v0.3.4
+    configPath: package-context.yaml
+  - image: gcr.io/kpt-fn/apply-replacements:v0.1.0
+    configPath: update-rolebinding.yaml

pkg/repository/testdata/update/updated/README.md

@@ -0,0 +1,21 @@
+# basens
+
+## Description
+kpt package for provisioning namespace
+
+## Usage
+
+### Fetch the package
+`kpt pkg get REPO_URI[.git]/PKG_PATH[@VERSION] basens`
+Details: https://kpt.dev/reference/cli/pkg/get/
+
+### View package content
+`kpt pkg tree basens`
+Details: https://kpt.dev/reference/cli/pkg/tree/
+
+### Apply the package
+```
+kpt live init basens
+kpt live apply basens --reconcile-timeout=2m --output=table
+```
+Details: https://kpt.dev/reference/cli/live/

pkg/repository/testdata/update/updated/namespace.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: Namespace
+metadata: # kpt-merge: example
+  name: backend
+spec: {}

pkg/repository/testdata/update/updated/package-context.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kptfile.kpt.dev
+  annotations:
+    config.kubernetes.io/local-config: "true"
+data:
+  name: backend

pkg/repository/testdata/update/updated/resourcequota.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ResourceQuota
+metadata: # kpt-merge: example/default
+  name: default
+  namespace: backend
+spec:
+  hard:
+    cpu: "40"
+    memory: 60G

pkg/repository/testdata/update/updated/rolebinding.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata: # kpt-merge: example/app-admin
+  name: app-admin
+  namespace: backend
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: app-admin
+subjects:
+- apiGroup: rbac.authorization.k8s.io
+  kind: Group
+  name: backend.admin@bigco.com

pkg/repository/testdata/update/updated/update-rolebinding.yaml

@@ -0,0 +1,20 @@
+apiVersion: fn.kpt.dev/v1alpha1
+kind: ApplyReplacements
+metadata: # kpt-merge: example/update-rolebinding
+  name: update-rolebinding
+  annotations:
+    config.kubernetes.io/local-config: "true"
+replacements:
+- source:
+    kind: ConfigMap
+    name: kptfile.kpt.dev
+    fieldPath: data.name
+  targets:
+  - select:
+      name: app-admin
+      kind: RoleBinding
+    fieldPaths:
+    - subjects.[kind=Group].name
+    options:
+      delimiter: '.'
+      index: 0

pkg/repository/testdata/update/upstream/Kptfile

@@ -0,0 +1,14 @@
+apiVersion: kpt.dev/v1
+kind: Kptfile
+metadata:
+  name: basens
+  annotations:
+    config.kubernetes.io/local-config: "true"
+info:
+  description: kpt package for provisioning namespace
+pipeline:
+  mutators:
+  - image: gcr.io/kpt-fn/set-namespace:v0.3.4
+    configPath: package-context.yaml
+  - image: gcr.io/kpt-fn/apply-replacements:v0.1.0
+    configPath: update-rolebinding.yaml

pkg/repository/testdata/update/upstream/README.md

@@ -0,0 +1,21 @@
+# basens
+
+## Description
+kpt package for provisioning namespace
+
+## Usage
+
+### Fetch the package
+`kpt pkg get REPO_URI[.git]/PKG_PATH[@VERSION] basens`
+Details: https://kpt.dev/reference/cli/pkg/get/
+
+### View package content
+`kpt pkg tree basens`
+Details: https://kpt.dev/reference/cli/pkg/tree/
+
+### Apply the package
+```
+kpt live init basens
+kpt live apply basens --reconcile-timeout=2m --output=table
+```
+Details: https://kpt.dev/reference/cli/live/

pkg/repository/testdata/update/upstream/namespace.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: example
+spec: {}

pkg/repository/testdata/update/upstream/package-context.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kptfile.kpt.dev
+  annotations:
+    config.kubernetes.io/local-config: "true"
+data:
+  name: example

pkg/repository/testdata/update/upstream/resourcequota.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ResourceQuota
+metadata:
+  name: default
+  namespace: example
+spec:
+  hard:
+    cpu: "40"
+    memory: 60G