diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_alloydbinstances.alloydb.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_alloydbinstances.alloydb.cnrm.cloud.google.com.yaml index 80b818c704..b9ed05c4ef 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_alloydbinstances.alloydb.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_alloydbinstances.alloydb.cnrm.cloud.google.com.yaml @@ -132,7 +132,7 @@ spec: type: string instanceTypeRef: description: |- - (Required) The type of instance. + The type of instance. Possible values: ["PRIMARY", "READ_POOL", "SECONDARY"] For PRIMARY and SECONDARY instances, set the value to refer to the name of the associated cluster. This is recommended because the instance type of primary and secondary instances is tied to the cluster type of the associated cluster. @@ -373,7 +373,7 @@ spec: type: string instanceTypeRef: description: |- - (Required) The type of instance. + The type of instance. Possible values: ["PRIMARY", "READ_POOL", "SECONDARY"] For PRIMARY and SECONDARY instances, set the value to refer to the name of the associated cluster. This is recommended because the instance type of primary and secondary instances is tied to the cluster type of the associated cluster. diff --git a/config/samples/resources/alloydbbackup/alloydb_v1beta1_alloydbinstance.yaml b/config/samples/resources/alloydbbackup/alloydb_v1beta1_alloydbinstance.yaml index f48cb8d004..2edd32eeac 100644 --- a/config/samples/resources/alloydbbackup/alloydb_v1beta1_alloydbinstance.yaml +++ b/config/samples/resources/alloydbbackup/alloydb_v1beta1_alloydbinstance.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/samples/resources/alloydbcluster/restored-from-backup-cluster/alloydb_v1beta1_alloydbinstance.yaml b/config/samples/resources/alloydbcluster/restored-from-backup-cluster/alloydb_v1beta1_alloydbinstance.yaml index 6bf18f630c..ceff899047 100644 --- a/config/samples/resources/alloydbcluster/restored-from-backup-cluster/alloydb_v1beta1_alloydbinstance.yaml +++ b/config/samples/resources/alloydbcluster/restored-from-backup-cluster/alloydb_v1beta1_alloydbinstance.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/samples/resources/alloydbinstance/primary-instance/alloydb_v1beta1_alloydbinstance.yaml b/config/samples/resources/alloydbinstance/primary-instance/alloydb_v1beta1_alloydbinstance.yaml index b7ab5cdb97..87fa0a46cc 100644 --- a/config/samples/resources/alloydbinstance/primary-instance/alloydb_v1beta1_alloydbinstance.yaml +++ b/config/samples/resources/alloydbinstance/primary-instance/alloydb_v1beta1_alloydbinstance.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/samples/resources/alloydbinstance/read-instance/alloydb_v1beta1_alloydbinstance.yaml b/config/samples/resources/alloydbinstance/read-instance/alloydb_v1beta1_alloydbinstance.yaml index ee0fbca4c6..dfbafab0e6 100644 --- a/config/samples/resources/alloydbinstance/read-instance/alloydb_v1beta1_alloydbinstance.yaml +++ b/config/samples/resources/alloydbinstance/read-instance/alloydb_v1beta1_alloydbinstance.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/samples/resources/alloydbinstance/zonal-instance/alloydb_v1beta1_alloydbinstance.yaml b/config/samples/resources/alloydbinstance/zonal-instance/alloydb_v1beta1_alloydbinstance.yaml index 6fe458095d..1337e2bd59 100644 --- a/config/samples/resources/alloydbinstance/zonal-instance/alloydb_v1beta1_alloydbinstance.yaml +++ b/config/samples/resources/alloydbinstance/zonal-instance/alloydb_v1beta1_alloydbinstance.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/samples/resources/alloydbuser/database-user/alloydb_v1beta1_alloydbinstance.yaml b/config/samples/resources/alloydbuser/database-user/alloydb_v1beta1_alloydbinstance.yaml index 7a518d79f9..7f36b30221 100644 --- a/config/samples/resources/alloydbuser/database-user/alloydb_v1beta1_alloydbinstance.yaml +++ b/config/samples/resources/alloydbuser/database-user/alloydb_v1beta1_alloydbinstance.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/samples/resources/alloydbuser/iam-user/alloydb_v1beta1_alloydbinstance.yaml b/config/samples/resources/alloydbuser/iam-user/alloydb_v1beta1_alloydbinstance.yaml index 62a9939025..848b791b4a 100644 --- a/config/samples/resources/alloydbuser/iam-user/alloydb_v1beta1_alloydbinstance.yaml +++ b/config/samples/resources/alloydbuser/iam-user/alloydb_v1beta1_alloydbinstance.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/servicemappings/alloydb.yaml b/config/servicemappings/alloydb.yaml index 3a90c4b403..386056257e 100644 --- a/config/servicemappings/alloydb.yaml +++ b/config/servicemappings/alloydb.yaml @@ -178,7 +178,7 @@ spec: parent: true - tfField: instance_type description: |- - (Required) The type of instance. + The type of instance. Possible values: ["PRIMARY", "READ_POOL", "SECONDARY"] For PRIMARY and SECONDARY instances, set the value to refer to the name of the associated cluster. This is recommended because the instance type of primary and secondary instances is tied to the cluster type of the associated cluster. diff --git a/pkg/clients/generated/apis/alloydb/v1beta1/alloydbinstance_types.go b/pkg/clients/generated/apis/alloydb/v1beta1/alloydbinstance_types.go index 88988ec541..427e8f1ef4 100644 --- a/pkg/clients/generated/apis/alloydb/v1beta1/alloydbinstance_types.go +++ b/pkg/clients/generated/apis/alloydb/v1beta1/alloydbinstance_types.go @@ -80,7 +80,7 @@ type AlloyDBInstanceSpec struct { // +optional InstanceType *string `json:"instanceType,omitempty"` - /* (Required) The type of instance. + /* The type of instance. Possible values: ["PRIMARY", "READ_POOL", "SECONDARY"] For PRIMARY and SECONDARY instances, set the value to refer to the name of the associated cluster. This is recommended because the instance type of primary and secondary instances is tied to the cluster type of the associated cluster. diff --git a/pkg/resourceoverrides/alloydb_instance.go b/pkg/resourceoverrides/alloydb_instance.go index 933d847daf..e2efc52dc6 100644 --- a/pkg/resourceoverrides/alloydb_instance.go +++ b/pkg/resourceoverrides/alloydb_instance.go @@ -20,8 +20,8 @@ import ( "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/k8s" "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/util/crdutil" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/create.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/create.yaml index 6b72b3ebbd..b4fbb0c362 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/create.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/dependencies.yaml index 3a035912bc..09751e2e78 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/dependencies.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/update.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/update.yaml index 4c7bdfa0fa..29c45e732f 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/update.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/create.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/create.yaml index a1f7d2f6e4..990e2d6ccc 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/create.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/dependencies.yaml index 0a6f18639e..a3e3dad6fa 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/dependencies.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/update.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/update.yaml index cb017adbd3..8770370057 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/update.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/alloydb/alloydbinstance.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/alloydb/alloydbinstance.md index b655d42f5d..cd466f45da 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/alloydb/alloydbinstance.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/alloydb/alloydbinstance.md @@ -220,7 +220,7 @@ The type of the instance. Possible values: [PRIMARY, READ_POOL, SECONDARY]{% end
object
{% verbatim %}(Required) The type of instance. +
{% verbatim %}The type of instance. Possible values: ["PRIMARY", "READ_POOL", "SECONDARY"] For PRIMARY and SECONDARY instances, set the value to refer to the name of the associated cluster. This is recommended because the instance type of primary and secondary instances is tied to the cluster type of the associated cluster. @@ -459,7 +459,7 @@ updateTime: string ### Primary Instance ```yaml -# Copyright 2024 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -530,7 +530,7 @@ spec: ### Read Instance ```yaml -# Copyright 2024 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -708,7 +708,7 @@ spec: ### Zonal Instance ```yaml -# Copyright 2024 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.