Skip to content

Commit

Permalink
fix: add local-config annotations to kptfiles and functionConfigs (#176)
Browse files Browse the repository at this point in the history
* fix: add local-config anno to kf

* add anno to setters fc

Co-authored-by: kaariger <23217852+kaariger@users.noreply.github.com>
  • Loading branch information
bharathkkb and kaariger authored May 24, 2022
1 parent 9227c87 commit 0d005f0
Show file tree
Hide file tree
Showing 79 changed files with 111 additions and 0 deletions.
1 change: 1 addition & 0 deletions catalog/acm/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ metadata:
name: acm
annotations:
blueprints.cloud.google.com/title: ACM blueprint
config.kubernetes.io/local-config: "true"
info:
description: |
A blueprint to install Anthos Config Management (ACM) on an existing GKE cluster. The installation is done by enrolling the cluster into GKE Hub Membership, enabling and configuring the ACM feature.
Expand Down
2 changes: 2 additions & 0 deletions catalog/acm/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata: # kpt-merge: /setters
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
# The name of this cluster
cluster-name: cluster-name
Expand Down
1 change: 1 addition & 0 deletions catalog/anthos-cluster/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: anthos-cluster
annotations:
blueprints.cloud.google.com/title: Anthos cluster blueprint
config.kubernetes.io/local-config: "true"
info:
description: |
A blueprint to create an Anthos cluster and install Anthos Config Management (ACM) on the cluster. The ACM installation is done by enrolling the cluster into GKE Hub Membership, enabling and configuring the ACM feature. An existing subnet needs to be provided where the cluster should be created.
Expand Down
1 change: 1 addition & 0 deletions catalog/anthos-cluster/acm/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: acm
annotations:
blueprints.cloud.google.com/title: ACM blueprint
config.kubernetes.io/local-config: "true"
upstream:
type: git
git:
Expand Down
2 changes: 2 additions & 0 deletions catalog/anthos-cluster/acm/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata: # kpt-merge: /setters
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
# The name of this cluster
cluster-name: cluster-name
Expand Down
1 change: 1 addition & 0 deletions catalog/anthos-cluster/gke/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: gke
annotations:
blueprints.cloud.google.com/title: GKE blueprint
config.kubernetes.io/local-config: "true"
upstream:
type: git
git:
Expand Down
1 change: 1 addition & 0 deletions catalog/anthos-cluster/gke/cluster/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: gke-cluster
annotations:
blueprints.cloud.google.com/title: GKE Cluster blueprint
config.kubernetes.io/local-config: "true"
info:
description: A GKE cluster with public masters and private nodes
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/anthos-cluster/gke/cluster/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata: # kpt-merge: /setters
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
# The name of this cluster
cluster-name: example-us-west4
Expand Down
1 change: 1 addition & 0 deletions catalog/anthos-cluster/gke/nodepools/primary/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: gke-nodepool
annotations:
blueprints.cloud.google.com/title: GKE Node Pool blueprint
config.kubernetes.io/local-config: "true"
info:
description: A GKE node pool with a dedicated service account
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/anthos-cluster/gke/nodepools/primary/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata: # kpt-merge: /setters
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
# The name of the cluster to attach this node pool to
cluster-name: example-us-east4
Expand Down
1 change: 1 addition & 0 deletions catalog/bucket/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: bucket
annotations:
blueprints.cloud.google.com/title: Google Cloud Storage Bucket blueprint
config.kubernetes.io/local-config: "true"
info:
description: A Google Cloud Storage bucket
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/bucket/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
name: bucket2
#project-id: project-id
Expand Down
1 change: 1 addition & 0 deletions catalog/empty/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ metadata:
name: empty
annotations:
blueprints.cloud.google.com/title: Empty blueprint
config.kubernetes.io/local-config: "true"
info:
description: An example of an empty blueprint.
1 change: 1 addition & 0 deletions catalog/gitops/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ metadata:
name: gitops-csr
annotations:
blueprints.cloud.google.com/title: CSR GitOps Pipeline blueprint
config.kubernetes.io/local-config: "true"
info:
description: |
A GitOps Continuous Deployment pipeline using Anthos Config Management (ACM),
Expand Down
1 change: 1 addition & 0 deletions catalog/gitops/configsync/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: configsync-csr
annotations:
blueprints.cloud.google.com/title: CSR ConfigSync blueprint
config.kubernetes.io/local-config: "true"
info:
description: |
A GitOps Continuous Deployment pipeline using Anthos Config Management (ACM)
Expand Down
1 change: 1 addition & 0 deletions catalog/gke-autopilot/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: gke-autopilot
annotations:
blueprints.cloud.google.com/title: GKE Autopilot blueprint
config.kubernetes.io/local-config: "true"
upstream:
type: git
git:
Expand Down
1 change: 1 addition & 0 deletions catalog/gke-autopilot/cluster/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: gke-cluster
annotations:
blueprints.cloud.google.com/title: GKE Cluster blueprint
config.kubernetes.io/local-config: "true"
info:
description: A GKE cluster with public masters and private nodes
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/gke-autopilot/cluster/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata: # kpt-merge: /setters
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
# The name of this cluster
cluster-name: example-us-west4
Expand Down
1 change: 1 addition & 0 deletions catalog/gke/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: gke
annotations:
blueprints.cloud.google.com/title: GKE blueprint
config.kubernetes.io/local-config: "true"
info:
description: |
A GKE cluster with a primary node pool. An existing subnet needs to be provided where the cluster should be created.
Expand Down
1 change: 1 addition & 0 deletions catalog/gke/cluster/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: gke-cluster
annotations:
blueprints.cloud.google.com/title: GKE Cluster blueprint
config.kubernetes.io/local-config: "true"
info:
description: A GKE cluster with public masters and private nodes
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/gke/cluster/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
# The name of this cluster
cluster-name: example-us-west4
Expand Down
1 change: 1 addition & 0 deletions catalog/gke/nodepools/primary/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: gke-nodepool
annotations:
blueprints.cloud.google.com/title: GKE Node Pool blueprint
config.kubernetes.io/local-config: "true"
info:
description: A GKE node pool with a dedicated service account
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/gke/nodepools/primary/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
# The name of the cluster to attach this node pool to
cluster-name: example-us-east4
Expand Down
1 change: 1 addition & 0 deletions catalog/hierarchy/bu/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: bu-hierarchy
annotations:
blueprints.cloud.google.com/title: Business Unit Hierarchy blueprint
config.kubernetes.io/local-config: "true"
info:
description: |
A GCP resource hierarchy organized by business units, teams, and
Expand Down
1 change: 1 addition & 0 deletions catalog/hierarchy/env-bu/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
annotations:
blueprints.cloud.google.com/title: |
Environment Business Unit Hierarchy package
config.kubernetes.io/local-config: "true"
info:
description: |
A GCP resource hierarchy organized by environments, business units, and
Expand Down
1 change: 1 addition & 0 deletions catalog/hierarchy/simple/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: simple-hierarchy
annotations:
blueprints.cloud.google.com/title: Simple Hierarchy blueprint
config.kubernetes.io/local-config: "true"
info:
description: A simple GCP resource hierarchy with top-level folders
pipeline:
Expand Down
1 change: 1 addition & 0 deletions catalog/hierarchy/team/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: team-hierarchy
annotations:
blueprints.cloud.google.com/title: Team Hierarchy blueprint
config.kubernetes.io/local-config: "true"
info:
description: A GCP resource hierarchy organized by teams and environments
pipeline:
Expand Down
1 change: 1 addition & 0 deletions catalog/iam-foundation/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ metadata:
name: iam-foundation
annotations:
blueprints.cloud.google.com/title: Organizational Foundational IAM
config.kubernetes.io/local-config: "true"
info:
description: This blueprint sets up recommended IAM roles for an enterprise organization in Google Cloud.
pipeline:
Expand Down
1 change: 1 addition & 0 deletions catalog/landing-zone-lite/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: landing-zone-lite
annotations:
blueprints.cloud.google.com/title: Landing Zone Lite blueprint
config.kubernetes.io/local-config: "true"
info:
description: |
Foundational landing zone blueprint for GCP for creating only a resource
Expand Down
2 changes: 2 additions & 0 deletions catalog/landing-zone-lite/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
# Organization ID and billing account
org-id: "123456789012"
Expand Down
1 change: 1 addition & 0 deletions catalog/landing-zone/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: landing-zone
annotations:
blueprints.cloud.google.com/title: Landing Zone blueprint
config.kubernetes.io/local-config: "true"
info:
description: |
Foundational landing zone blueprint for GCP.
Expand Down
2 changes: 2 additions & 0 deletions catalog/landing-zone/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
# Organization ID and billing account
org-id: "123456789012"
Expand Down
1 change: 1 addition & 0 deletions catalog/log-export/folder/bigquery-export/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: bigquery-export
annotations:
blueprints.cloud.google.com/title: BigQuery Export blueprint
config.kubernetes.io/local-config: "true"
info:
description: A log export on a folder that sinks to BigQuery
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/log-export/folder/bigquery-export/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
namespace: my-namespace
dataset-description: BigQuery audit logs for folder
Expand Down
1 change: 1 addition & 0 deletions catalog/log-export/folder/pubsub-export/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: pubsub-export
annotations:
blueprints.cloud.google.com/title: PubSub Export blueprint
config.kubernetes.io/local-config: "true"
info:
description: A log export on a folder that sinks to PubSub
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/log-export/folder/pubsub-export/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
namespace: my-namespace
filter: ""
Expand Down
1 change: 1 addition & 0 deletions catalog/log-export/folder/storage-export/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: storage-export
annotations:
blueprints.cloud.google.com/title: Cloud Storage Export blueprint
config.kubernetes.io/local-config: "true"
info:
description: A log export on a folder that sinks to Cloud Storage
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/log-export/folder/storage-export/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
namespace: my-namespace
uniform-bucket-level-access: "true"
Expand Down
1 change: 1 addition & 0 deletions catalog/log-export/org/bigquery-export/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: bigquery-export
annotations:
blueprints.cloud.google.com/title: BigQuery Export blueprint
config.kubernetes.io/local-config: "true"
info:
description: A log export on a organization that sinks to BigQuery
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/log-export/org/bigquery-export/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
# This is required
project-id: my-project-id
Expand Down
1 change: 1 addition & 0 deletions catalog/log-export/org/pubsub-export/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: pubsub-export
annotations:
blueprints.cloud.google.com/title: PubSub Export blueprint
config.kubernetes.io/local-config: "true"
info:
description: A log export on a organization that sinks to PubSub
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/log-export/org/pubsub-export/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
namespace: my-namespace
filter: ""
Expand Down
1 change: 1 addition & 0 deletions catalog/log-export/org/storage-export/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: storage-export
annotations:
blueprints.cloud.google.com/title: Cloud Storage Export blueprint
config.kubernetes.io/local-config: "true"
info:
description: A log export on a organization that sinks to Cloud Storage
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/log-export/org/storage-export/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
namespace: my-namespace
uniform-bucket-level-access: "true"
Expand Down
1 change: 1 addition & 0 deletions catalog/networking/dns/managedzone-forwarding/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: dns-forwarding-managed-zone
annotations:
blueprints.cloud.google.com/title: Cloud DNS Managed Zone Forwarding blueprint
config.kubernetes.io/local-config: "true"
info:
description: A private Cloud DNS managed zone with forwarding config
pipeline:
Expand Down
2 changes: 2 additions & 0 deletions catalog/networking/dns/managedzone-forwarding/setters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: setters
annotations:
config.kubernetes.io/local-config: "true"
data:
namespace: networking
domain: example.com.
Expand Down
1 change: 1 addition & 0 deletions catalog/networking/dns/managedzone-peering/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: dns-peered-managed-zone
annotations:
blueprints.cloud.google.com/title: Cloud DNS Managed Zone Peering blueprint
config.kubernetes.io/local-config: "true"
info:
description: A private Cloud DNS managed zone with peering config
pipeline:
Expand Down
Loading

0 comments on commit 0d005f0

Please sign in to comment.