Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openstack-k8s-operators/keystone-operator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cd10285c2c1c1fa222afeecd155aa8b375d5186e
Choose a base ref
..
head repository: openstack-k8s-operators/keystone-operator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3974d636532dc284d8aa0af7520e6ab48de8ae2e
Choose a head ref
Showing with 14 additions and 14 deletions.
  1. +1 −1 api/go.mod
  2. +2 −2 api/go.sum
  3. +8 −8 controllers/keystoneapi_controller.go
  4. +1 −1 go.mod
  5. +2 −2 go.sum
2 changes: 1 addition & 1 deletion api/go.mod
Original file line number Diff line number Diff line change
@@ -75,4 +75,4 @@ require (
// must consistent within modules and service operators
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 //allow-merging

replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20250109154406-5941b198acda
replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20250110132704-f4bf5c3b0892
4 changes: 2 additions & 2 deletions api/go.sum
Original file line number Diff line number Diff line change
@@ -104,8 +104,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stuggi/lib-common/modules/common v0.0.0-20250109154406-5941b198acda h1:5Eiq0j48ndXAjLMo6ygK6da2zH6iKVn6YMESUkaN+6Y=
github.com/stuggi/lib-common/modules/common v0.0.0-20250109154406-5941b198acda/go.mod h1:YpNTuJhDWhbXM50O3qBkhO7M+OOyRmWkNVmJ4y3cyFs=
github.com/stuggi/lib-common/modules/common v0.0.0-20250110132704-f4bf5c3b0892 h1:nODvJKaxN/T3Lzo/peopLL/UL5fT0aZdQ0XHT/Ql6u4=
github.com/stuggi/lib-common/modules/common v0.0.0-20250110132704-f4bf5c3b0892/go.mod h1:YpNTuJhDWhbXM50O3qBkhO7M+OOyRmWkNVmJ4y3cyFs=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
16 changes: 8 additions & 8 deletions controllers/keystoneapi_controller.go
Original file line number Diff line number Diff line change
@@ -1263,14 +1263,14 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
},
// Configs
{
Name: fmt.Sprintf("%s-config-data", instance.Name),
Namespace: instance.Namespace,
Type: util.TemplateTypeConfig,
InstanceType: instance.Kind,
AdditionalTemplate: customTemplates,
CustomData: customData,
ConfigOptions: templateParameters,
Labels: cmLabels,
Name: fmt.Sprintf("%s-config-data", instance.Name),
Namespace: instance.Namespace,
Type: util.TemplateTypeConfig,
InstanceType: instance.Kind,
RawTemplate: customTemplates,
CustomData: customData,
ConfigOptions: templateParameters,
Labels: cmLabels,
},
}
return oko_secret.EnsureSecrets(ctx, h, instance, tmpl, envVars)
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -87,4 +87,4 @@ replace github.com/openstack-k8s-operators/keystone-operator/api => ./api
// must consistent within modules and service operators
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 //allow-merging

replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20250109154406-5941b198acda
replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20250110132704-f4bf5c3b0892
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -106,8 +106,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stuggi/lib-common/modules/common v0.0.0-20250109154406-5941b198acda h1:5Eiq0j48ndXAjLMo6ygK6da2zH6iKVn6YMESUkaN+6Y=
github.com/stuggi/lib-common/modules/common v0.0.0-20250109154406-5941b198acda/go.mod h1:YpNTuJhDWhbXM50O3qBkhO7M+OOyRmWkNVmJ4y3cyFs=
github.com/stuggi/lib-common/modules/common v0.0.0-20250110132704-f4bf5c3b0892 h1:nODvJKaxN/T3Lzo/peopLL/UL5fT0aZdQ0XHT/Ql6u4=
github.com/stuggi/lib-common/modules/common v0.0.0-20250110132704-f4bf5c3b0892/go.mod h1:YpNTuJhDWhbXM50O3qBkhO7M+OOyRmWkNVmJ4y3cyFs=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=