Skip to content

[Cloud Bigtable App Profile Beta Migration] Add direct controller #4345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 5, 2025
Merged

[Cloud Bigtable App Profile Beta Migration] Add direct controller #4345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c9c778e
Create app profile controller with some initial changes
djyau Apr 11, 2025
d3e8d74
Use grpc client options
djyau Apr 24, 2025
29623b9
Fix update paths in mockgcp for bigtable app profile
djyau Apr 28, 2025
210b371
Add IgnoreWarnings when switching to multi cluster. Record real gcp l…
djyau Apr 29, 2025
82abd3f
Record real gcp log with controller
djyau Apr 29, 2025
babeaab
Write resourceID back into Spec, re-record real gcp log
djyau Apr 30, 2025
b06ab32
Clear http log and re record real gcp from scratch
djyau May 5, 2025
8f5aa9d
BigtableAppProfile: properly handle update in controller
jingyih May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions apis/bigtable/v1beta1/appprofile_identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,18 @@ func (i *AppProfileIdentity) ID() string {
return i.id
}

func (i *AppProfileIdentity) Parent() *InstanceIdentity {
return i.parent
}

func (i *AppProfileIdentity) ParentString() string {
return i.parent.String()
}

func (i *AppProfileIdentity) ParentInstanceIdString() string {
return i.parent.Id
}

// New builds a AppProfileIdentity from the Config Connector AppProfile object.
func NewAppProfileIdentity(ctx context.Context, reader client.Reader, obj *BigtableAppProfile) (*AppProfileIdentity, error) {
// Get Parent
Expand Down
2 changes: 1 addition & 1 deletion apis/bigtable/v1beta1/appprofile_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ type BigtableAppProfileObservedState struct {
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:resource:categories=gcp,shortName=gcpbigtableappprofile;gcpbigtableappprofiles
// +kubebuilder:subresource:status
// +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/system=true";"cnrm.cloud.google.com/tf2crd=true";"cnrm.cloud.google.com/stability-level=stable"
// +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/system=true";
// +kubebuilder:printcolumn:name="Age",JSONPath=".metadata.creationTimestamp",type="date"
// +kubebuilder:printcolumn:name="Ready",JSONPath=".status.conditions[?(@.type=='Ready')].status",type="string",description="When 'True', the most recent reconcile of the resource succeeded"
// +kubebuilder:printcolumn:name="Status",JSONPath=".status.conditions[?(@.type=='Ready')].reason",type="string",description="The reason for the value in 'Ready'"
Expand Down
2 changes: 0 additions & 2 deletions ...8s.io_v1_customresourcedefinition_bigtableappprofiles.bigtable.cnrm.cloud.google.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ metadata:
creationTimestamp: null
labels:
cnrm.cloud.google.com/managed-by-kcc: "true"
cnrm.cloud.google.com/stability-level: stable
cnrm.cloud.google.com/system: "true"
cnrm.cloud.google.com/tf2crd: "true"
name: bigtableappprofiles.bigtable.cnrm.cloud.google.com
spec:
group: bigtable.cnrm.cloud.google.com
Expand Down
57 changes: 28 additions & 29 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ require (
cloud.google.com/go/firestore v1.18.0
cloud.google.com/go/gkebackup v1.6.3
cloud.google.com/go/gkemulticloud v1.5.1
cloud.google.com/go/iam v1.4.1
cloud.google.com/go/iam v1.5.0
cloud.google.com/go/iap v1.10.3
cloud.google.com/go/kms v1.21.0
cloud.google.com/go/logging v1.13.0
cloud.google.com/go/managedkafka v0.4.0
cloud.google.com/go/metastore v1.14.3
cloud.google.com/go/monitoring v1.24.0
cloud.google.com/go/monitoring v1.24.1
cloud.google.com/go/netapp v1.7.1
cloud.google.com/go/networkmanagement v1.18.0
cloud.google.com/go/networksecurity v0.10.3
Expand Down Expand Up @@ -100,15 +100,15 @@ require (
github.com/zclconf/go-cty v1.16.2
go.opencensus.io v0.24.0
go.uber.org/zap v1.26.0
golang.org/x/oauth2 v0.27.0
golang.org/x/sync v0.12.0
golang.org/x/time v0.10.0
google.golang.org/api v0.224.0
golang.org/x/oauth2 v0.29.0
golang.org/x/sync v0.13.0
golang.org/x/time v0.11.0
google.golang.org/api v0.229.0
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb
google.golang.org/grpc v1.71.0
google.golang.org/protobuf v1.36.5
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e
google.golang.org/grpc v1.71.1
google.golang.org/protobuf v1.36.6
gopkg.in/dnaeon/go-vcr.v3 v3.2.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.27.11
Expand All @@ -131,18 +131,17 @@ require (
cloud.google.com/go/orgpolicy v1.14.2 // indirect
cloud.google.com/go/osconfig v1.14.3 // indirect
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
go.uber.org/goleak v1.3.0 // indirect
)

require (
bitbucket.org/creachadair/stringset v0.0.8 // indirect
cel.dev/expr v0.19.2 // indirect
cloud.google.com/go v0.118.3 // indirect
cloud.google.com/go/auth v0.15.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
cloud.google.com/go/bigtable v1.35.0
cloud.google.com/go v0.120.0 // indirect
cloud.google.com/go/auth v0.16.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
cloud.google.com/go/bigtable v1.37.0
cloud.google.com/go/compute/metadata v0.6.0 // indirect
cloud.google.com/go/longrunning v0.6.5
cloud.google.com/go/longrunning v0.6.6
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect; indsirect
Expand Down Expand Up @@ -193,7 +192,7 @@ require (
github.com/google/pprof v0.0.0-20240528025155-186aa0362fba // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.5 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
Expand Down Expand Up @@ -264,22 +263,22 @@ require (
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
go.opentelemetry.io/otel/trace v1.34.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.uber.org/multierr v1.10.0 // indirect
golang.org/x/crypto v0.36.0 // indirect
golang.org/x/crypto v0.37.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.24.0 // indirect
golang.org/x/net v0.38.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/term v0.30.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/net v0.39.0 // indirect
golang.org/x/sys v0.32.0 // indirect
golang.org/x/term v0.31.0 // indirect
golang.org/x/text v0.24.0 // indirect
golang.org/x/tools v0.31.0 // indirect
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
Expand Down
Loading
Loading