Skip to content

Commit

Permalink
Merge pull request kubernetes#96013 from rahulkjoshi/gce-conf
Browse files Browse the repository at this point in the history
Mark SecondaryRangeName as deprecated.
  • Loading branch information
k8s-ci-robot authored Oct 30, 2020
2 parents 68c41e2 + f32f468 commit c0c0aa3
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions staging/src/k8s.io/legacy-cloud-providers/gce/gce.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ type Cloud struct {
unsafeIsLegacyNetwork bool
// unsafeSubnetworkURL should be used only via SubnetworkURL() accessor,
// to ensure it was properly initialized.
unsafeSubnetworkURL string
unsafeSubnetworkURL string
// DEPRECATED: Do not rely on this value as it may be incorrect.
secondaryRangeName string
networkProjectID string
onXPN bool
Expand Down Expand Up @@ -179,6 +180,7 @@ type ConfigGlobal struct {
NetworkProjectID string `gcfg:"network-project-id"`
NetworkName string `gcfg:"network-name"`
SubnetworkName string `gcfg:"subnetwork-name"`
// DEPRECATED: Do not rely on this value as it may be incorrect.
// SecondaryRangeName is the name of the secondary range to allocate IP
// aliases. The secondary range must be present on the subnetwork the
// cluster is attached to.
Expand Down Expand Up @@ -226,12 +228,13 @@ type CloudConfig struct {
NetworkURL string
SubnetworkName string
SubnetworkURL string
SecondaryRangeName string
NodeTags []string
NodeInstancePrefix string
TokenSource oauth2.TokenSource
UseMetadataServer bool
AlphaFeatureGate *AlphaFeatureGate
// DEPRECATED: Do not rely on this value as it may be incorrect.
SecondaryRangeName string
NodeTags []string
NodeInstancePrefix string
TokenSource oauth2.TokenSource
UseMetadataServer bool
AlphaFeatureGate *AlphaFeatureGate
}

func init() {
Expand Down

0 comments on commit c0c0aa3

Please sign in to comment.