Upgrade remaining blueprints

catalog/bucket/Kptfile

@@ -1,12 +1,8 @@
-apiVersion: kpt.dev/v1alpha2
+apiVersion: kpt.dev/v1
 kind: Kptfile
 metadata:
   name: bucket
 pipeline:
   mutators:
     - image: gcr.io/kpt-fn/apply-setters:v0.1
-      configMap:
-        name: bucket2
-        namespace: config-control
-        project-id: $DEFAULT_PROJECT
-        storage-class: standard
+      configPath: setters.yaml

catalog/bucket/setters.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: setters
+data:
+  name: bucket2
+  namespace: config-control
+  project-id: $DEFAULT_PROJECT
+  storage-class: standard

catalog/gitops/setters.yaml

@@ -3,12 +3,12 @@ kind: ConfigMap
 metadata:
   name: setters-config
 data:
+  # You can leave these defaults
+  namespace: config-control
   # This should be the name of your Config Controller instance
   cluster-name: cluster-name
+  deployment-repo: deployment-repo
   # This should be the project where you deployed Config Controller
   project-id: project-id
   project-number: "1234567890123"
-  # You can leave these defaults
-  namespace: config-control
-  deployment-repo: deployment-repo
   source-repo: source-repo

catalog/hierarchy/bu/setters.yaml

@@ -3,5 +3,5 @@ kind: ConfigMap
 metadata:
   name: setters
 data:
-  org-id: "123456789012"
   namespace: hierarchy
+  org-id: "123456789012"

catalog/landing-zone/setters.yaml

@@ -3,13 +3,13 @@ kind: ConfigMap
 metadata:
   name: setters
 data:
-  # Organization ID and billing account
-  org-id: "123456789012"
   billing-account-id: AAAAAA-BBBBBB-CCCCCC
-  # The project where Config Controller is deployed
-  management-project-id: management-project-id
+  group-billing-admins: gcp-billing-admins@example.com
   # Groups to use for org-level roles
   group-org-admins: gcp-organization-admins@example.com
-  group-billing-admins: gcp-billing-admins@example.com
   # This default is safe to keep
   management-namespace: config-control
+  # The project where Config Controller is deployed
+  management-project-id: management-project-id
+  # Organization ID and billing account
+  org-id: "123456789012"

catalog/log-export/folder/bigquery-export/Kptfile

@@ -1,4 +1,4 @@
-apiVersion: kpt.dev/v1alpha2
+apiVersion: kpt.dev/v1
 kind: Kptfile
 metadata:
   name: bigquery-export
@@ -7,13 +7,4 @@ info:
 pipeline:
   mutators:
     - image: gcr.io/kpt-fn/apply-setters:v0.1
-      configMap:
-        dataset-description: BigQuery audit logs for folder
-        dataset-location: US
-        dataset-name: audit-logs
-        default-table-expiration-ms: "3600000"
-        delete-contents-on-destroy: "false"
-        filter: ""
-        folder-k8s-name: my.folder.k8s.name
-        namespace: my-namespace
-        project-id: my-project-id
+      configPath: setters.yaml

catalog/log-export/folder/bigquery-export/setters.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: setters
+data:
+  namespace: my-namespace
+  dataset-description: BigQuery audit logs for folder
+  dataset-location: US
+  dataset-name: audit-logs
+  default-table-expiration-ms: "3600000"
+  delete-contents-on-destroy: "false"
+  filter: ""
+  folder-k8s-name: my.folder.k8s.name
+  project-id: my-project-id

catalog/log-export/folder/pubsub-export/Kptfile

@@ -1,4 +1,4 @@
-apiVersion: kpt.dev/v1alpha2
+apiVersion: kpt.dev/v1
 kind: Kptfile
 metadata:
   name: pubsub-export
@@ -7,9 +7,4 @@ info:
 pipeline:
   mutators:
     - image: gcr.io/kpt-fn/apply-setters:v0.1
-      configMap:
-        filter: ""
-        folder-k8s-name: my.folder.k8s.name
-        namespace: my-namespace
-        project-id: my-project-id
-        topic-name: pubsub-logexport-dataset
+      configPath: setters.yaml

catalog/log-export/folder/pubsub-export/setters.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: setters
+data:
+  namespace: my-namespace
+  filter: ""
+  folder-k8s-name: my.folder.k8s.name
+  project-id: my-project-id
+  topic-name: pubsub-logexport-dataset

catalog/log-export/folder/storage-export/Kptfile

@@ -1,4 +1,4 @@
-apiVersion: kpt.dev/v1alpha2
+apiVersion: kpt.dev/v1
 kind: Kptfile
 metadata:
   name: storage-export
@@ -7,12 +7,4 @@ info:
 pipeline:
   mutators:
     - image: gcr.io/kpt-fn/apply-setters:v0.1
-      configMap:
-        bucket-policy-only: "false"
-        filter: ""
-        folder-k8s-name: my.folder.k8s.name
-        location: US
-        namespace: my-namespace
-        project-id: my-project-id
-        storage-bucket-name: my-storage-bucket
-        storage-class: MULTI_REGIONAL
+      configPath: setters.yaml

catalog/log-export/folder/storage-export/setters.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: setters
+data:
+  namespace: my-namespace
+  bucket-policy-only: "false"
+  filter: ""
+  folder-k8s-name: my.folder.k8s.name
+  location: US
+  project-id: my-project-id
+  storage-bucket-name: my-storage-bucket
+  storage-class: MULTI_REGIONAL

catalog/log-export/org/bigquery-export/Kptfile

@@ -1,4 +1,4 @@
-apiVersion: kpt.dev/v1alpha2
+apiVersion: kpt.dev/v1
 kind: Kptfile
 metadata:
   name: bigquery-export
@@ -7,15 +7,4 @@ info:
 pipeline:
   mutators:
     - image: gcr.io/kpt-fn/apply-setters:v0.1
-      configMap:
-        dataset-description: BigQuery audit logs for organization
-        dataset-location: US
-        dataset-name: audit-logs
-        default-table-expiration-ms: "3600000"
-        delete-contents-on-destroy: "false"
-        filter: ""
-        management-namespace: config-control
-        management-project-id: management-project-id
-        namespace: logging
-        org-id: "123456789012"
-        project-id: my-project-id
+      configPath: setters.yaml

catalog/log-export/org/bigquery-export/setters.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: setters
+data:
+  namespace: logging
+  dataset-description: BigQuery audit logs for organization
+  dataset-location: US
+  dataset-name: audit-logs
+  default-table-expiration-ms: "3600000"
+  delete-contents-on-destroy: "false"
+  filter: ""
+  management-namespace: config-control
+  management-project-id: management-project-id
+  org-id: "123456789012"
+  project-id: my-project-id

catalog/log-export/org/pubsub-export/Kptfile

@@ -1,4 +1,4 @@
-apiVersion: kpt.dev/v1alpha2
+apiVersion: kpt.dev/v1
 kind: Kptfile
 metadata:
   name: pubsub-export
@@ -7,9 +7,4 @@ info:
 pipeline:
   mutators:
     - image: gcr.io/kpt-fn/apply-setters:v0.1
-      configMap:
-        filter: ""
-        namespace: my-namespace
-        org-id: "123456789012"
-        project-id: my-project-id
-        topic-name: pubsub-logexport-dataset
+      configPath: setters.yaml

catalog/log-export/org/pubsub-export/setters.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: setters
+data:
+  namespace: my-namespace
+  filter: ""
+  org-id: "123456789012"
+  project-id: my-project-id
+  topic-name: pubsub-logexport-dataset

catalog/log-export/org/storage-export/Kptfile

@@ -1,4 +1,4 @@
-apiVersion: kpt.dev/v1alpha2
+apiVersion: kpt.dev/v1
 kind: Kptfile
 metadata:
   name: storage-export
@@ -7,12 +7,4 @@ info:
 pipeline:
   mutators:
     - image: gcr.io/kpt-fn/apply-setters:v0.1
-      configMap:
-        bucket-policy-only: "false"
-        filter: ""
-        location: US
-        namespace: my-namespace
-        org-id: "123456789012"
-        project-id: my-project-id
-        storage-bucket-name: my-storage-bucket
-        storage-class: MULTI_REGIONAL
+      configPath: setters.yaml

catalog/log-export/org/storage-export/setters.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: setters
+data:
+  namespace: my-namespace
+  bucket-policy-only: "false"
+  filter: ""
+  location: US
+  org-id: "123456789012"
+  project-id: my-project-id
+  storage-bucket-name: my-storage-bucket
+  storage-class: MULTI_REGIONAL

catalog/project/setters.yaml

@@ -4,8 +4,7 @@ metadata:
   name: setters
 data:
   folder-name: name.of.folder
-  project-id: project-id
-
   # These defaults can be kept
   folder-namespace: hierarchy
   networking-namespace: networking
+  project-id: project-id

catalog/redis-bucket/Kptfile

@@ -1,14 +1,8 @@
-apiVersion: kpt.dev/v1alpha2
+apiVersion: kpt.dev/v1
 kind: Kptfile
 metadata:
   name: redis-bucket
 pipeline:
   mutators:
     - image: gcr.io/kpt-fn/apply-setters:v0.1
-      configMap:
-        name: redis-bucket
-        namespace: config-control
-        network: default
-        project-id: $DEFAULT_PROJECT
-        region: us-central1
-        storage-class: standard
+      configPath: setters.yaml

catalog/redis-bucket/setters.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: setters
+data:
+  name: redis-bucket
+  namespace: config-control
+  network: default
+  project-id: $DEFAULT_PROJECT
+  region: us-central1
+  storage-class: standard

catalog/spanner/Kptfile

@@ -1,13 +1,8 @@
-apiVersion: kpt.dev/v1alpha2
+apiVersion: kpt.dev/v1
 kind: Kptfile
 metadata:
   name: spanner
 pipeline:
   mutators:
     - image: gcr.io/kpt-fn/apply-setters:v0.1
-      configMap:
-        config-region: regional-us-central1
-        database-name: spanner-sample-database
-        instance-name: spanner-sample-instance
-        namespace: my-namespace
-        num-nodes: "1"
+      configPath: setters.yaml

catalog/spanner/setters.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: setters
+data:
+  namespace: my-namespace
+  config-region: regional-us-central1
+  database-name: spanner-sample-database
+  instance-name: spanner-sample-instance
+  num-nodes: "1"