diff --git a/README.md b/README.md index 6482faa2a5..608a398047 100644 --- a/README.md +++ b/README.md @@ -334,7 +334,7 @@ kubectl get customresourcedefinition \ The spec schema shows all supported (writable) properties, and matches the underlying API with the following exception: - Fields which reference other resources are named `xyzRef` and use Kubernetes-style references. For example: ```yaml - apiVersion: pubsub.cnrm.cloud.google.com/v1alpha1 + apiVersion: pubsub.cnrm.cloud.google.com/v1alpha2 kind: PubSubSubscription metadata: name: pubsubsubscription-sample @@ -351,7 +351,9 @@ You can find more details on the meaning of specific properties in the API docum | bigtableclusters.bigtable.cnrm.cloud.google.com | [Bigtable Cluster](https://cloud.google.com/bigtable/docs/reference/admin/rest/v2/projects.instances.clusters) | | bigtableinstances.bigtable.cnrm.cloud.google.com | [Bigtable Instance](https://cloud.google.com/bigtable/docs/reference/admin/rest/v2/projects.instances) | | bigquerydatasets.bigquery.cnrm.cloud.google.com | [BigQuery Dataset](https://cloud.google.com/bigquery/docs/reference/rest/v2/datasets) | +| computehealthchecks.compute.cloud.google.com | [Compute Health Check](https://cloud.google.com/compute/docs/reference/rest/v1/healthChecks) | | iampolicies.iam.cnrm.cloud.google.com | [IAM Policy](https://cloud.google.com/iam/reference/rest/v1/Policy) | +| iamserviceaccounts.iam.cnrm.cloud.google.com | [IAM Service Account](https://cloud.google.com/iam/reference/rest/v1/projects.serviceAccounts) | | pubsubsubscriptions.pubsub.cnrm.cloud.google.com | [Pub/Sub Subscription](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) | | pubsubtopics.pubsub.cnrm.cloud.google.com | [Pub/Sub Topic](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics) | | redisinstances.redis.cnrm.cloud.google.com | [Cloud Memorystore for Redis](https://cloud.google.com/memorystore/docs/redis/reference/rest/v1/projects.locations.instances) | @@ -407,7 +409,7 @@ metadata: name: iampolicy-sample spec: resourceRef: - apiVersion: pubsub.cnrm.cloud.google.com/v1alpha1 + apiVersion: pubsub.cnrm.cloud.google.com/v1alpha2 kind: PubSubTopic name: pubsubtopic-sample bindings: diff --git a/samples/apps/bookstore/config/manifests/pubsub-subscription.yaml b/samples/apps/bookstore/config/manifests/pubsub-subscription.yaml index 1d884f2bc9..e76f44a6a1 100644 --- a/samples/apps/bookstore/config/manifests/pubsub-subscription.yaml +++ b/samples/apps/bookstore/config/manifests/pubsub-subscription.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: pubsub.cnrm.cloud.google.com/v1alpha1 +apiVersion: pubsub.cnrm.cloud.google.com/v1alpha2 kind: PubSubSubscription metadata: name: cnrm-subscription diff --git a/samples/apps/bookstore/config/manifests/pubsub-topic.yaml b/samples/apps/bookstore/config/manifests/pubsub-topic.yaml index 02202139f9..db338ed484 100644 --- a/samples/apps/bookstore/config/manifests/pubsub-topic.yaml +++ b/samples/apps/bookstore/config/manifests/pubsub-topic.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: pubsub.cnrm.cloud.google.com/v1alpha1 +apiVersion: pubsub.cnrm.cloud.google.com/v1alpha2 kind: PubSubTopic metadata: name: cnrm-topic diff --git a/samples/apps/bookstore/config/manifests/spanner-instance.yaml b/samples/apps/bookstore/config/manifests/spanner-instance.yaml index 9612dc92eb..696bdff900 100644 --- a/samples/apps/bookstore/config/manifests/spanner-instance.yaml +++ b/samples/apps/bookstore/config/manifests/spanner-instance.yaml @@ -12,11 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: spanner.cnrm.cloud.google.com/v1alpha1 +apiVersion: spanner.cnrm.cloud.google.com/v1alpha2 kind: SpannerInstance metadata: name: cnrm-instance spec: config: regional-us-central1 displayName: "Bookstore" - nodeCount: 1 + numNodes: 1 diff --git a/samples/resources/bigquery_v1alpha1_bigquerydataset.yaml b/samples/resources/bigquery_v1alpha2_bigquerydataset.yaml similarity index 62% rename from samples/resources/bigquery_v1alpha1_bigquerydataset.yaml rename to samples/resources/bigquery_v1alpha2_bigquerydataset.yaml index 576c512e37..171a82b7ce 100644 --- a/samples/resources/bigquery_v1alpha1_bigquerydataset.yaml +++ b/samples/resources/bigquery_v1alpha2_bigquerydataset.yaml @@ -1,8 +1,8 @@ -apiVersion: bigquery.cnrm.cloud.google.com/v1alpha1 +apiVersion: bigquery.cnrm.cloud.google.com/v1alpha2 kind: BigQueryDataset metadata: name: bigquerydatasetsample spec: - defaultTableExpirationMs: "3600000" + defaultTableExpirationMs: 3600000 description: "BigQuery Dataset Sample" friendlyName: bigquerydataset-sample diff --git a/samples/resources/compute_v1alpha1_computehealthcheck.yaml b/samples/resources/compute_v1alpha1_computehealthcheck.yaml new file mode 100644 index 0000000000..d4091023d7 --- /dev/null +++ b/samples/resources/compute_v1alpha1_computehealthcheck.yaml @@ -0,0 +1,11 @@ +apiVersion: compute.cnrm.cloud.google.com/v1alpha1 +kind: ComputeHealthCheck +metadata: + labels: + label-one: "value-one" + name: computehealthcheck-sample +spec: + checkIntervalSec: 10 + type: TCP + tcpHealthCheck: + port: 80 diff --git a/samples/resources/iam_v1alpha1_iampolicy.yaml b/samples/resources/iam_v1alpha1_iampolicy.yaml index 22e8780466..eb9836fead 100644 --- a/samples/resources/iam_v1alpha1_iampolicy.yaml +++ b/samples/resources/iam_v1alpha1_iampolicy.yaml @@ -6,7 +6,7 @@ metadata: name: iampolicy-sample spec: resourceRef: - apiVersion: pubsub.cnrm.cloud.google.com/v1alpha1 + apiVersion: pubsub.cnrm.cloud.google.com/v1alpha2 kind: PubSubTopic name: pubsubtopic-sample bindings: diff --git a/samples/resources/iam_v1alpha1_iamserviceaccount.yaml b/samples/resources/iam_v1alpha1_iamserviceaccount.yaml new file mode 100644 index 0000000000..4a92d3ac3b --- /dev/null +++ b/samples/resources/iam_v1alpha1_iamserviceaccount.yaml @@ -0,0 +1,8 @@ +apiVersion: iam.cnrm.cloud.google.com/v1alpha1 +kind: IAMServiceAccount +metadata: + labels: + label-one: "value-one" + name: iamserviceaccount-example +spec: + displayName: KCC Example Service Account \ No newline at end of file diff --git a/samples/resources/pubsub_v1alpha1_pubsubsubscription.yaml b/samples/resources/pubsub_v1alpha2_pubsubsubscription.yaml similarity index 82% rename from samples/resources/pubsub_v1alpha1_pubsubsubscription.yaml rename to samples/resources/pubsub_v1alpha2_pubsubsubscription.yaml index 1b5db3ba15..0cff66fe54 100644 --- a/samples/resources/pubsub_v1alpha1_pubsubsubscription.yaml +++ b/samples/resources/pubsub_v1alpha2_pubsubsubscription.yaml @@ -1,4 +1,4 @@ -apiVersion: pubsub.cnrm.cloud.google.com/v1alpha1 +apiVersion: pubsub.cnrm.cloud.google.com/v1alpha2 kind: PubSubSubscription metadata: labels: diff --git a/samples/resources/pubsub_v1alpha1_pubsubtopic.yaml b/samples/resources/pubsub_v1alpha2_pubsubtopic.yaml similarity index 64% rename from samples/resources/pubsub_v1alpha1_pubsubtopic.yaml rename to samples/resources/pubsub_v1alpha2_pubsubtopic.yaml index 70c10d7a45..6f3dfd8ae2 100644 --- a/samples/resources/pubsub_v1alpha1_pubsubtopic.yaml +++ b/samples/resources/pubsub_v1alpha2_pubsubtopic.yaml @@ -1,4 +1,4 @@ -apiVersion: pubsub.cnrm.cloud.google.com/v1alpha1 +apiVersion: pubsub.cnrm.cloud.google.com/v1alpha2 kind: PubSubTopic metadata: labels: diff --git a/samples/resources/redis_v1alpha2_redisinstance.yaml b/samples/resources/redis_v1alpha3_redisinstance.yaml similarity index 79% rename from samples/resources/redis_v1alpha2_redisinstance.yaml rename to samples/resources/redis_v1alpha3_redisinstance.yaml index aec7339701..7efcd61a35 100644 --- a/samples/resources/redis_v1alpha2_redisinstance.yaml +++ b/samples/resources/redis_v1alpha3_redisinstance.yaml @@ -1,4 +1,4 @@ -apiVersion: redis.cnrm.cloud.google.com/v1alpha2 +apiVersion: redis.cnrm.cloud.google.com/v1alpha3 kind: RedisInstance metadata: labels: diff --git a/samples/resources/spanner_v1alpha1_spannerinstance.yaml b/samples/resources/spanner_v1alpha2_spannerinstance.yaml similarity index 72% rename from samples/resources/spanner_v1alpha1_spannerinstance.yaml rename to samples/resources/spanner_v1alpha2_spannerinstance.yaml index 74896f3234..7641e9db1d 100644 --- a/samples/resources/spanner_v1alpha1_spannerinstance.yaml +++ b/samples/resources/spanner_v1alpha2_spannerinstance.yaml @@ -1,4 +1,4 @@ -apiVersion: spanner.cnrm.cloud.google.com/v1alpha1 +apiVersion: spanner.cnrm.cloud.google.com/v1alpha2 kind: SpannerInstance metadata: labels: @@ -7,4 +7,4 @@ metadata: spec: config: regional-us-west1 displayName: Spanner Instance Sample - nodeCount: 2 + numNodes: 2 diff --git a/samples/resources/storage_v1alpha1_storagebucket.yaml b/samples/resources/storage_v1alpha1_storagebucket.yaml deleted file mode 100644 index b6312ec717..0000000000 --- a/samples/resources/storage_v1alpha1_storagebucket.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: storage.cnrm.cloud.google.com/v1alpha1 -kind: StorageBucket -metadata: - labels: - label-one: "value-one" - name: storagebucket-sample -spec: - lifecycle: - rules: - - action: - type: Delete - condition: - age: 7 diff --git a/samples/resources/storage_v1alpha2_storagebucket.yaml b/samples/resources/storage_v1alpha2_storagebucket.yaml new file mode 100644 index 0000000000..d261d90daa --- /dev/null +++ b/samples/resources/storage_v1alpha2_storagebucket.yaml @@ -0,0 +1,12 @@ +apiVersion: storage.cnrm.cloud.google.com/v1alpha2 +kind: StorageBucket +metadata: + labels: + label-one: "value-one" + name: storagebucket-sample +spec: + lifecycleRule: + - action: + type: Delete + condition: + age: 7 diff --git a/samples/resources/storage_v1alpha1_storagebucketaccesscontrol.yaml b/samples/resources/storage_v1alpha2_storagebucketaccesscontrol.yaml similarity index 81% rename from samples/resources/storage_v1alpha1_storagebucketaccesscontrol.yaml rename to samples/resources/storage_v1alpha2_storagebucketaccesscontrol.yaml index 1b5086af40..793b38aac6 100644 --- a/samples/resources/storage_v1alpha1_storagebucketaccesscontrol.yaml +++ b/samples/resources/storage_v1alpha2_storagebucketaccesscontrol.yaml @@ -1,4 +1,4 @@ -apiVersion: storage.cnrm.cloud.google.com/v1alpha1 +apiVersion: storage.cnrm.cloud.google.com/v1alpha2 kind: StorageBucketAccessControl metadata: labels: diff --git a/samples/resources/storage_v1alpha1_storagedefaultobjectaccesscontrol.yaml b/samples/resources/storage_v1alpha2_storagedefaultobjectaccesscontrol.yaml similarity index 82% rename from samples/resources/storage_v1alpha1_storagedefaultobjectaccesscontrol.yaml rename to samples/resources/storage_v1alpha2_storagedefaultobjectaccesscontrol.yaml index ae404e6844..53a0b813df 100644 --- a/samples/resources/storage_v1alpha1_storagedefaultobjectaccesscontrol.yaml +++ b/samples/resources/storage_v1alpha2_storagedefaultobjectaccesscontrol.yaml @@ -1,4 +1,4 @@ -apiVersion: storage.cnrm.cloud.google.com/v1alpha1 +apiVersion: storage.cnrm.cloud.google.com/v1alpha2 kind: StorageDefaultObjectAccessControl metadata: labels: