Skip to content

Commit

Permalink
update samples to new versions and add new resources to README
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Kibbe committed Jul 1, 2019
1 parent 54ec80d commit 25cf09d
Show file tree
Hide file tree
Showing 16 changed files with 49 additions and 29 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) |
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion samples/apps/bookstore/config/manifests/pubsub-topic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions samples/apps/bookstore/config/manifests/spanner-instance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions samples/resources/compute_v1alpha1_computehealthcheck.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion samples/resources/iam_v1alpha1_iampolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 8 additions & 0 deletions samples/resources/iam_v1alpha1_iamserviceaccount.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: pubsub.cnrm.cloud.google.com/v1alpha1
apiVersion: pubsub.cnrm.cloud.google.com/v1alpha2
kind: PubSubSubscription
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: pubsub.cnrm.cloud.google.com/v1alpha1
apiVersion: pubsub.cnrm.cloud.google.com/v1alpha2
kind: PubSubTopic
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: redis.cnrm.cloud.google.com/v1alpha2
apiVersion: redis.cnrm.cloud.google.com/v1alpha3
kind: RedisInstance
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: spanner.cnrm.cloud.google.com/v1alpha1
apiVersion: spanner.cnrm.cloud.google.com/v1alpha2
kind: SpannerInstance
metadata:
labels:
Expand All @@ -7,4 +7,4 @@ metadata:
spec:
config: regional-us-west1
displayName: Spanner Instance Sample
nodeCount: 2
numNodes: 2
13 changes: 0 additions & 13 deletions samples/resources/storage_v1alpha1_storagebucket.yaml

This file was deleted.

12 changes: 12 additions & 0 deletions samples/resources/storage_v1alpha2_storagebucket.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: storage.cnrm.cloud.google.com/v1alpha1
apiVersion: storage.cnrm.cloud.google.com/v1alpha2
kind: StorageBucketAccessControl
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: storage.cnrm.cloud.google.com/v1alpha1
apiVersion: storage.cnrm.cloud.google.com/v1alpha2
kind: StorageDefaultObjectAccessControl
metadata:
labels:
Expand Down

0 comments on commit 25cf09d

Please sign in to comment.