Skip to content

Scaffolding fixes #644

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
mandre merged 5 commits into from
Jan 15, 2026
Merged

Scaffolding fixes #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df9c8a1
scaffolding: fix resource name in template
mandre Jan 13, 2026
8c8422d
scaffolding: rename file for consistency
mandre Jan 13, 2026
6b101ec
scaffolding: do not add required deps _and_ import deps
mandre Jan 14, 2026
457a098
scaffolding: fix typo
mandre Jan 14, 2026
c375dd2
Fix sample domain config
mandre Jan 14, 2026
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
4 changes: 2 additions & 2 deletions cmd/scaffold-controller/data/tests/create-full/00-create-resource.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
name: {{ $packageName }}-create-full
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -21,7 +21,7 @@ metadata:
name: {{ .PackageName }}-create-full
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
6 changes: 3 additions & 3 deletions cmd/scaffold-controller/data/tests/create-minimal/00-create-resource.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
name: {{ $packageName }}-create-minimal
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -21,7 +21,7 @@ metadata:
name: {{ .PackageName }}-create-minimal
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -30,7 +30,7 @@ spec:
{{- if len .RequiredCreateDependencies }}
resource:
{{- range .RequiredCreateDependencies }}
{{ . | camelCase }}Ref: {{ $packageName }}-create-full
{{ . | camelCase }}Ref: {{ $packageName }}-create-minimal
{{- end }}
{{- else }}
resource: {}
Expand Down
4 changes: 2 additions & 2 deletions cmd/scaffold-controller/data/tests/dependency/01-create-dependencies.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
name: {{ $packageName }}-dependency-pending
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -29,7 +29,7 @@ metadata:
name: {{ $packageName }}-dependency
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
22 changes: 2 additions & 20 deletions cmd/scaffold-controller/data/tests/import-dependency/01-create-trap-resource.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,7 @@ metadata:
name: {{ $packageName }}-import-dependency-not-this-one
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
# TODO(scaffolding): Add the necessary fields to create the resource
resource: {}
{{ end -}}
{{ range .RequiredCreateDependencies -}}
---
apiVersion: openstack.k-orc.cloud/v1alpha1
kind: {{ . }}
metadata:
name: {{ $packageName }}-import-dependency-not-this-one
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -37,14 +22,11 @@ metadata:
name: {{ $packageName }}-import-dependency-not-this-one
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
resource:
{{- range .RequiredCreateDependencies }}
{{ . | camelCase }}Ref: {{ $packageName }}-import-dependency-not-this-one
{{- end }}
{{- range .ImportDependencies }}
{{ . | camelCase }}Ref: {{ $packageName }}-import-dependency-not-this-one
{{- end }}
Expand Down
22 changes: 2 additions & 20 deletions cmd/scaffold-controller/data/tests/import-dependency/02-create-resource.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
{{ $packageName := .PackageName -}}
{{ range .RequiredCreateDependencies -}}
---
apiVersion: openstack.k-orc.cloud/v1alpha1
kind: {{ . }}
metadata:
name: {{ $packageName }}-import-dependency-external
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
# TODO(scaffolding): Add the necessary fields to create the resource
resource: {}
{{ end -}}
{{ range .ImportDependencies -}}
---
apiVersion: openstack.k-orc.cloud/v1alpha1
Expand All @@ -22,7 +7,7 @@ metadata:
name: {{ $packageName }}-import-dependency-external
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -36,14 +21,11 @@ metadata:
name: {{ $packageName }}-import-dependency-external
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack-admin
secretName: openstack-clouds
managementPolicy: managed
resource:
{{- range .RequiredCreateDependencies }}
{{ . | camelCase }}Ref: {{ $packageName }}-import-dependency-external
{{- end }}
{{- range .ImportDependencies }}
{{ . | camelCase }}Ref: {{ $packageName }}-import-dependency-external
{{- end }}
Expand Down
6 changes: 3 additions & 3 deletions cmd/scaffold-controller/data/tests/import-error/00-create-resources.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
name: {{ $packageName }}-import-error
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -21,7 +21,7 @@ metadata:
name: {{ .PackageName }}-import-error-external-1
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -38,7 +38,7 @@ metadata:
name: {{ .PackageName }}-import-error-external-2
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
4 changes: 2 additions & 2 deletions cmd/scaffold-controller/data/tests/import/01-create-trap-resource.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
name: {{ $packageName }}-import-external-not-this-one
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -24,7 +24,7 @@ metadata:
name: {{ .PackageName }}-import-external-not-this-one
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
4 changes: 2 additions & 2 deletions cmd/scaffold-controller/data/tests/import/02-create-resource.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
name: {{ $packageName }}-import
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -21,7 +21,7 @@ metadata:
name: {{ .PackageName }}-import-external
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
4 changes: 2 additions & 2 deletions cmd/scaffold-controller/data/tests/update/00-minimal-resource.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
name: {{ $packageName }}-update
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand All @@ -21,7 +21,7 @@ metadata:
name: {{ .PackageName }}-update
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created or updated
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created or updated
cloudName: openstack
secretName: openstack-clouds
managementPolicy: managed
Expand Down
0 ...sts/update/00-prerequisites.yaml.template → ...data/tests/update/00-secret.yaml.template
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions config/samples/openstack_v1alpha1_domain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ metadata:
name: domain-sample
spec:
cloudCredentialsRef:
# TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
cloudName: openstack
cloudName: openstack-admin
secretName: openstack-clouds
managementPolicy: managed
resource:
description: Sample Domain
# TODO(scaffolding): Add all fields the resource supports
enabled: true
4 changes: 2 additions & 2 deletions internal/controllers/port/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,10 +521,10 @@ func handlePortSecurityUpdate(updateOpts ports.UpdateOptsBuilder, resource *reso
return updateOpts
}

func handleAdminStateUpUpdate(updateOpts *ports.UpdateOpts, resource *resourceSpecT, osResouce *osResourceT) {
func handleAdminStateUpUpdate(updateOpts *ports.UpdateOpts, resource *resourceSpecT, osResource *osResourceT) {
adminStateUp := resource.AdminStateUp
if adminStateUp != nil {
if *adminStateUp != osResouce.AdminStateUp {
if *adminStateUp != osResource.AdminStateUp {
updateOpts.AdminStateUp = adminStateUp
}
}
Expand Down