reset project-id back to default;

Author: yuwenma

porch/config/samples/packages/environment/config-control/Kptfile

@@ -8,4 +8,4 @@ pipeline:
   mutators:
   - image: gcr.io/kpt-fn-demo/set-project-id:v0.1-justin
     configMap:
-      projectID: justinsb
+      projectID: project-id

porch/config/samples/packages/environment/config-control/kcc.yaml

@@ -4,7 +4,7 @@ metadata:
   name: cc-robot-project-id
   namespace: config-control
   annotations:
-    cnrm.cloud.google.com/project-id: justinsb
+    cnrm.cloud.google.com/project-id: project-id
     cnrm.cloud.google.com/blueprint: 'kpt-fn'
 spec:
   displayName: ConfigConnector ServiceAccount for namespace project-id
@@ -16,10 +16,10 @@ metadata:
   name: cc-robot-workloadidentity-project-id
   namespace: config-control
   annotations:
-    cnrm.cloud.google.com/project-id: justinsb
+    cnrm.cloud.google.com/project-id: project-id
     cnrm.cloud.google.com/blueprint: 'kpt-fn'
 spec:
-  member: serviceAccount:parent-project-id.svc.id.goog[cnrm-system/cnrm-controller-manager-justinsb]
+  member: serviceAccount:parent-project-id.svc.id.goog[cnrm-system/cnrm-controller-manager-project-id]
   role: roles/iam.workloadIdentityUser
   resourceRef:
     apiVersion: iam.cnrm.cloud.google.com/v1beta1
@@ -31,9 +31,6 @@ kind: IAMPolicyMember
 metadata:
   name: cc-robot-project-id
   namespace: config-control
-  annotations:
-    cnrm.cloud.google.com/project-id: justinsb
-    cnrm.cloud.google.com/blueprint: 'kpt-fn'
 spec:
   memberFrom:
     serviceAccountRef:
@@ -44,4 +41,4 @@ spec:
   resourceRef:
     apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1
     kind: Project
-    external: justinsb
+    external: project-id

porch/config/samples/packages/environment/config-control/project.yaml

@@ -3,9 +3,6 @@ kind: Folder
 metadata:
   name: dev
   namespace: config-control
-  annotations:
-    cnrm.cloud.google.com/project-id: justinsb
-    cnrm.cloud.google.com/blueprint: 'kpt-fn'
 spec:
   folderRef:
     name: environments

porch/config/samples/packages/environment/config-control/rbac.yaml

@@ -3,14 +3,11 @@ kind: IAMPolicyMember
 metadata:
   name: project-id-dev-admins
   namespace: config-control
-  annotations:
-    cnrm.cloud.google.com/project-id: justinsb
-    cnrm.cloud.google.com/blueprint: 'kpt-fn'
 spec:
   # TODO: Replace with group?
   member: user:justinsb@google.com
   role: roles/editor
   resourceRef:
     apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1
     kind: Project
-    external: justinsb
+    external: project-id

porch/config/samples/packages/environment/project-specific/kcc.yaml

@@ -10,8 +10,5 @@ kind: ConfigConnectorContext
 metadata:
   name: configconnectorcontext.core.cnrm.cloud.google.com
   namespace: project-id
-  annotations:
-    cnrm.cloud.google.com/project-id: project-id
-    cnrm.cloud.google.com/blueprint: 'kpt-fn'
 spec:
   googleServiceAccount: cc-robot@project-id.iam.gserviceaccount.com