Skip to content

Commit 55e308a

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #128 from barbacbd/gcp-custom-endpoints-feature-gate-update
no-jira: Machine Api Operator GCP must search for the GCP Custom Endpoints Installer feature gate
2 parents 0151588 + f4bf1e2 commit 55e308a

16 files changed

+388
-20
lines changed

‎cmd/manager/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func main() {
9090

9191
// Sets up feature gates
9292
defaultMutableGate := feature.DefaultMutableFeatureGate
93-
gateOpts, err := features.NewFeatureGateOptions(defaultMutableGate, apifeatures.SelfManaged, apifeatures.FeatureGateMachineAPIMigration, apifeatures.FeatureGateGCPCustomAPIEndpoints)
93+
gateOpts, err := features.NewFeatureGateOptions(defaultMutableGate, apifeatures.SelfManaged, apifeatures.FeatureGateMachineAPIMigration, apifeatures.FeatureGateGCPCustomAPIEndpointsInstall)
9494
if err != nil {
9595
klog.Fatalf("Error setting up feature gates: %v", err)
9696
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/googleapis/gax-go/v2 v2.14.1
1111
github.com/onsi/ginkgo/v2 v2.23.4
1212
github.com/onsi/gomega v1.37.0
13-
github.com/openshift/api v0.0.0-20250724151358-f313adb86331
13+
github.com/openshift/api v0.0.0-20250806102053-6a7223edb2fc
1414
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20250718085303-e712b1ebf374
1515
github.com/openshift/library-go v0.0.0-20250724123005-03d85c4e997c
1616
github.com/openshift/machine-api-operator v0.2.1-0.20250724145424-66e6d1f43b3c

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,8 @@ github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus
346346
github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8=
347347
github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
348348
github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
349-
github.com/openshift/api v0.0.0-20250724151358-f313adb86331 h1:97Hz1Gfcq1JgCShhjL31D/0dCt28Zk/NrMisTS1JrKE=
350-
github.com/openshift/api v0.0.0-20250724151358-f313adb86331/go.mod h1:SPLf21TYPipzCO67BURkCfK6dcIIxx0oNRVWaOyRcXM=
349+
github.com/openshift/api v0.0.0-20250806102053-6a7223edb2fc h1:kAiInOGnd0+nsDcwl5YVceHfbT8Xk7tJq1vlYDVBonA=
350+
github.com/openshift/api v0.0.0-20250806102053-6a7223edb2fc/go.mod h1:SPLf21TYPipzCO67BURkCfK6dcIIxx0oNRVWaOyRcXM=
351351
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee h1:tOtrrxfDEW8hK3eEsHqxsXurq/D6LcINGfprkQC3hqY=
352352
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee/go.mod h1:zhRiYyNMk89llof2qEuGPWPD+joQPhCRUc2IK0SB510=
353353
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20250718085303-e712b1ebf374 h1:ldUi0e64kdYJC2+ucB24GRXIXfMnI3NpSkcnalPqBGo=

‎pkg/cloud/gcp/actuators/machine/actuator_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ func TestActuatorExists(t *testing.T) {
448448

449449
func NewDefaultMutableFeatureGate(gateConfig map[string]bool) (featuregate.MutableFeatureGate, error) {
450450
defaultMutableGate := feature.DefaultMutableFeatureGate
451-
_, err := features.NewFeatureGateOptions(defaultMutableGate, openshiftfeatures.SelfManaged, openshiftfeatures.FeatureGateMachineAPIMigration, openshiftfeatures.FeatureGateGCPCustomAPIEndpoints)
451+
_, err := features.NewFeatureGateOptions(defaultMutableGate, openshiftfeatures.SelfManaged, openshiftfeatures.FeatureGateMachineAPIMigration, openshiftfeatures.FeatureGateGCPCustomAPIEndpointsInstall)
452452
if err != nil {
453453
return nil, fmt.Errorf("failed to set up default feature gate: %w", err)
454454
}

‎pkg/cloud/gcp/actuators/machine/machine_scope.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func newMachineScope(params machineScopeParams) (*machineScope, error) {
9090

9191
var computeEndpoint *configv1.GCPServiceEndpoint = nil
9292
var tagsEndpoint *configv1.GCPServiceEndpoint = nil
93-
if params.featureGates.Enabled(featuregate.Feature(apifeatures.FeatureGateGCPCustomAPIEndpoints)) {
93+
if params.featureGates.Enabled(featuregate.Feature(apifeatures.FeatureGateGCPCustomAPIEndpointsInstall)) {
9494
lookupFunc := params.endpointLookup
9595
if lookupFunc == nil {
9696
lookupFunc = util.GetGCPServiceEndpoint

‎pkg/cloud/gcp/actuators/machineset/controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ func (r *Reconciler) getRealGCPService(namespace string, providerConfig machinev
221221
}
222222

223223
var endpoint *configv1.GCPServiceEndpoint = nil
224-
if r.FeatureGates.Enabled(featuregate.Feature(apifeatures.FeatureGateGCPCustomAPIEndpoints)) {
224+
if r.FeatureGates.Enabled(featuregate.Feature(apifeatures.FeatureGateGCPCustomAPIEndpointsInstall)) {
225225
endpoint, err = util.GetGCPServiceEndpoint(r.Client, configv1.GCPServiceEndpointNameCompute)
226226
if err != nil {
227227
return nil, fmt.Errorf("failed to get GCP compute service endpoint: %v", err)

‎vendor/github.com/openshift/api/config/v1/types_infrastructure.go‎

Lines changed: 16 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml‎

Lines changed: 103 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)