mirror of
https://github.com/openshift/installer.git
synced 2026-02-05 06:46:36 +01:00
Merge pull request #10249 from barbacbd/CORS-4318
OCPBUGS-74363: Remove region option for the GCP Private Service Connect Endpoint
This commit is contained in:
@@ -6332,11 +6332,6 @@ spec:
|
||||
description: Name contains the name of the private service
|
||||
connect endpoint.
|
||||
type: string
|
||||
region:
|
||||
description: |-
|
||||
Region is the region where the endpoint resides.
|
||||
When the region is empty, the location is assumed to be global.
|
||||
type: string
|
||||
required:
|
||||
- name
|
||||
type: object
|
||||
|
||||
@@ -770,13 +770,7 @@ func GetPrivateServiceConnectEndpoint(client *compute.Service, project string, e
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
var forwardingRules *compute.ForwardingRuleList
|
||||
var forwardingRuleErr error
|
||||
if endpoint.Region != "" {
|
||||
forwardingRules, forwardingRuleErr = client.ForwardingRules.List(project, endpoint.Region).Do()
|
||||
} else {
|
||||
forwardingRules, forwardingRuleErr = client.GlobalForwardingRules.List(project).Do()
|
||||
}
|
||||
forwardingRules, forwardingRuleErr := client.GlobalForwardingRules.List(project).Do()
|
||||
if forwardingRuleErr != nil {
|
||||
return nil, fmt.Errorf("failed to list forwarding rules: %w", forwardingRuleErr)
|
||||
}
|
||||
|
||||
@@ -45,11 +45,6 @@ type PSCEndpoint struct {
|
||||
// Name contains the name of the private service connect endpoint.
|
||||
Name string `json:"name"`
|
||||
|
||||
// Region is the region where the endpoint resides.
|
||||
// When the region is empty, the location is assumed to be global.
|
||||
// +optional
|
||||
Region string `json:"region,omitempty"`
|
||||
|
||||
// ClusterUseOnly should be set to true when the installer should use
|
||||
// the public api endpoints and all cluster operators should use the
|
||||
// api endpoint overrides. The value should be false when the installer
|
||||
|
||||
Reference in New Issue
Block a user