Skip to content

Commit b721b46

Browse files
committed
bugfix: upgrade to resource selector
1 parent d2c881f commit b721b46

3 files changed

Lines changed: 16 additions & 7 deletions

File tree

go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/onsi/gomega v1.36.1
1010
github.com/spf13/cobra v1.8.1
1111
github.com/spf13/viper v1.20.1
12-
go.miloapis.com/milo v0.0.0-20250624192330-fd15c9091be7
12+
go.miloapis.com/milo v0.0.0-20250702010202-c34f18ccdb23
1313
k8s.io/apimachinery v0.33.2
1414
k8s.io/client-go v0.32.1
1515
sigs.k8s.io/controller-runtime v0.20.4
@@ -78,6 +78,7 @@ require (
7878
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
7979
go.uber.org/multierr v1.11.0 // indirect
8080
go.uber.org/zap v1.27.0 // indirect
81+
go.yaml.in/yaml/v2 v2.4.2 // indirect
8182
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
8283
golang.org/x/net v0.41.0 // indirect
8384
golang.org/x/oauth2 v0.25.0 // indirect
@@ -106,5 +107,5 @@ require (
106107
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
107108
sigs.k8s.io/randfill v1.0.0 // indirect
108109
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
109-
sigs.k8s.io/yaml v1.4.0 // indirect
110+
sigs.k8s.io/yaml v1.5.0 // indirect
110111
)

go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ go.miloapis.com/milo v0.0.0-20250624185205-374dc7fff291 h1:LKCMBlDlrFbHxW04r16R4
155155
go.miloapis.com/milo v0.0.0-20250624185205-374dc7fff291/go.mod h1:hh74+itTatDKu88z8rOItbrn3g98jei7ecaMKjJpFds=
156156
go.miloapis.com/milo v0.0.0-20250624192330-fd15c9091be7 h1:VTo62HkAfnlqJixH1nF3ktl/+Z/dZ/CemNVEIjnvzK8=
157157
go.miloapis.com/milo v0.0.0-20250624192330-fd15c9091be7/go.mod h1:hh74+itTatDKu88z8rOItbrn3g98jei7ecaMKjJpFds=
158+
go.miloapis.com/milo v0.0.0-20250702010202-c34f18ccdb23 h1:aKbPb+19bA733kxBTIEE8jZ6kHXuJ29mgbcBMEXQxjM=
159+
go.miloapis.com/milo v0.0.0-20250702010202-c34f18ccdb23/go.mod h1:hh74+itTatDKu88z8rOItbrn3g98jei7ecaMKjJpFds=
158160
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
159161
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
160162
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 h1:ZIg3ZT/aQ7AfKqdwp7ECpOK6vHqquXXuyTjIO8ZdmPs=
@@ -181,6 +183,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
181183
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
182184
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
183185
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
186+
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
187+
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
184188
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
185189
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
186190
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -275,3 +279,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxg
275279
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
276280
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
277281
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
282+
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
283+
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=

internal/controller/resourcemanager/personal_organization_controller.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,13 @@ func (r *PersonalOrganizationController) Reconcile(ctx context.Context, req ctrl
121121
Name: r.Config.RoleName,
122122
Namespace: r.Config.RoleNamespace,
123123
},
124-
TargetRef: iamv1alpha1.TargetReference{
125-
APIGroup: resourcemanagerv1alpha1.GroupVersion.Group,
126-
Kind: "Organization",
127-
Name: personalOrg.Name,
128-
UID: string(personalOrg.UID),
124+
ResourceSelector: iamv1alpha1.ResourceSelector{
125+
ResourceRef: &iamv1alpha1.ResourceReference{
126+
APIGroup: resourcemanagerv1alpha1.GroupVersion.Group,
127+
Kind: "Organization",
128+
Name: personalOrg.Name,
129+
UID: string(personalOrg.UID),
130+
},
129131
},
130132
Subjects: []iamv1alpha1.Subject{
131133
{

0 commit comments

Comments
 (0)