From 70200067f62f310a3a2dd74dbc3bfe0d65551d36 Mon Sep 17 00:00:00 2001 From: Anh Le Date: Mon, 3 Feb 2025 18:46:16 +0000 Subject: [PATCH 1/2] Remove alpha opt-in annotation for spanner instance --- .../spanner_v1beta1_spannerinstance.yaml | 2 -- .../spannerdatabase/spanner_v1beta1_spannerinstance.yaml | 2 -- .../spannerinstance/spanner_v1beta1_spannerinstance.yaml | 2 -- .../bigqueryconnection/bigqueryconnectionconnection.md | 2 -- .../generated/resource-docs/spanner/spannerdatabase.md | 2 -- .../generated/resource-docs/spanner/spannerinstance.md | 2 -- 6 files changed, 12 deletions(-) diff --git a/config/samples/resources/bigqueryconnectionconnection/cloudspanner-connection/spanner_v1beta1_spannerinstance.yaml b/config/samples/resources/bigqueryconnectionconnection/cloudspanner-connection/spanner_v1beta1_spannerinstance.yaml index e616289517..e083cac609 100644 --- a/config/samples/resources/bigqueryconnectionconnection/cloudspanner-connection/spanner_v1beta1_spannerinstance.yaml +++ b/config/samples/resources/bigqueryconnectionconnection/cloudspanner-connection/spanner_v1beta1_spannerinstance.yaml @@ -16,8 +16,6 @@ apiVersion: spanner.cnrm.cloud.google.com/v1beta1 kind: SpannerInstance metadata: name: bigqueryconnection-dep - annotations: - alpha.cnrm.cloud.google.com/reconciler: "direct" spec: config: regional-us-west1 displayName: BigQueryConnection Dependency \ No newline at end of file diff --git a/config/samples/resources/spannerdatabase/spanner_v1beta1_spannerinstance.yaml b/config/samples/resources/spannerdatabase/spanner_v1beta1_spannerinstance.yaml index 89bd3d466c..84463c02cd 100644 --- a/config/samples/resources/spannerdatabase/spanner_v1beta1_spannerinstance.yaml +++ b/config/samples/resources/spannerdatabase/spanner_v1beta1_spannerinstance.yaml @@ -16,8 +16,6 @@ apiVersion: spanner.cnrm.cloud.google.com/v1beta1 kind: SpannerInstance metadata: name: spannerdatabase-dep - annotations: - alpha.cnrm.cloud.google.com/reconciler: "direct" spec: config: regional-us-west1 displayName: Spanner Database Dependency diff --git a/config/samples/resources/spannerinstance/spanner_v1beta1_spannerinstance.yaml b/config/samples/resources/spannerinstance/spanner_v1beta1_spannerinstance.yaml index 8de8771bf5..c05a024d45 100644 --- a/config/samples/resources/spannerinstance/spanner_v1beta1_spannerinstance.yaml +++ b/config/samples/resources/spannerinstance/spanner_v1beta1_spannerinstance.yaml @@ -18,8 +18,6 @@ metadata: labels: label-one: "value-one" name: spannerinstance-sample - annotations: - alpha.cnrm.cloud.google.com/reconciler: "direct" spec: config: regional-us-west1 displayName: Spanner Instance Sample diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/bigqueryconnection/bigqueryconnectionconnection.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/bigqueryconnection/bigqueryconnectionconnection.md index e317019c1b..87cf75349e 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/bigqueryconnection/bigqueryconnectionconnection.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/bigqueryconnection/bigqueryconnectionconnection.md @@ -1047,8 +1047,6 @@ apiVersion: spanner.cnrm.cloud.google.com/v1beta1 kind: SpannerInstance metadata: name: bigqueryconnection-dep - annotations: - alpha.cnrm.cloud.google.com/reconciler: "direct" spec: config: regional-us-west1 displayName: BigQueryConnection Dependency diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/spanner/spannerdatabase.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/spanner/spannerdatabase.md index 34e860f0ba..dd9818ef35 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/spanner/spannerdatabase.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/spanner/spannerdatabase.md @@ -403,8 +403,6 @@ apiVersion: spanner.cnrm.cloud.google.com/v1beta1 kind: SpannerInstance metadata: name: spannerdatabase-dep - annotations: - alpha.cnrm.cloud.google.com/reconciler: "direct" spec: config: regional-us-west1 displayName: Spanner Database Dependency diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/spanner/spannerinstance.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/spanner/spannerinstance.md index 6a668623a8..4079486fb8 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/spanner/spannerinstance.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/spanner/spannerinstance.md @@ -419,8 +419,6 @@ metadata: labels: label-one: "value-one" name: spannerinstance-sample - annotations: - alpha.cnrm.cloud.google.com/reconciler: "direct" spec: config: regional-us-west1 displayName: Spanner Instance Sample From 162ba9eb7116fcf7eac87af1d4e0d591156662e2 Mon Sep 17 00:00:00 2001 From: Anh Le Date: Mon, 3 Feb 2025 20:26:15 +0000 Subject: [PATCH 2/2] Make github Samples test to run direct controller for SpannerInstance --- scripts/github-actions/tests-e2e-samples | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/github-actions/tests-e2e-samples b/scripts/github-actions/tests-e2e-samples index 7e443714c3..0d29a90cc6 100755 --- a/scripts/github-actions/tests-e2e-samples +++ b/scripts/github-actions/tests-e2e-samples @@ -33,6 +33,7 @@ MOCK_GROUP_EMAIL="test@group.com" RUN_E2E=1 \ E2E_KUBE_TARGET=envtest \ E2E_GCP_TARGET=mock \ -KCC_USE_DIRECT_RECONCILERS="ComputeForwardingRule" \ +KCC_USE_DIRECT_RECONCILERS="ComputeForwardingRule,SpannerInstance" \ KCC_ENG_GROUP_EMAIL="${MOCK_GROUP_EMAIL}" \ go test -test.count=1 -timeout 3600s -v ./tests/e2e -run TestAllInSeries/samples + \ No newline at end of file