Skip to content

Commit f4bf1e2

Browse files
committed
cloud/gcp/actuators/machine:
** Update the references from FeatureGateGCPCustomAPIEndpoints to FeatureGateGCPCustomAPIEndpointsInstall due to new procedures. This inidcates that the feature gate originates as an openshift installer feature gate. cloud/gcp/actuators/machineset: ** Update the references from FeatureGateGCPCustomAPIEndpoints to FeatureGateGCPCustomAPIEndpointsInstall due to new procedures. This inidcates that the feature gate originates as an openshift installer feature gate.
1 parent 3fb47f6 commit f4bf1e2

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
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
}

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)

0 commit comments

Comments
 (0)