Merge pull request #96013 from rahulkjoshi/gce-conf

Mark SecondaryRangeName as deprecated.
This commit is contained in:
Kubernetes Prow Robot 2020-10-30 15:47:05 -07:00 committed by GitHub
commit c0c0aa341f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -130,6 +130,7 @@ type Cloud struct {
// unsafeSubnetworkURL should be used only via SubnetworkURL() accessor, // unsafeSubnetworkURL should be used only via SubnetworkURL() accessor,
// to ensure it was properly initialized. // to ensure it was properly initialized.
unsafeSubnetworkURL string unsafeSubnetworkURL string
// DEPRECATED: Do not rely on this value as it may be incorrect.
secondaryRangeName string secondaryRangeName string
networkProjectID string networkProjectID string
onXPN bool onXPN bool
@ -179,6 +180,7 @@ type ConfigGlobal struct {
NetworkProjectID string `gcfg:"network-project-id"` NetworkProjectID string `gcfg:"network-project-id"`
NetworkName string `gcfg:"network-name"` NetworkName string `gcfg:"network-name"`
SubnetworkName string `gcfg:"subnetwork-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 // SecondaryRangeName is the name of the secondary range to allocate IP
// aliases. The secondary range must be present on the subnetwork the // aliases. The secondary range must be present on the subnetwork the
// cluster is attached to. // cluster is attached to.
@ -226,6 +228,7 @@ type CloudConfig struct {
NetworkURL string NetworkURL string
SubnetworkName string SubnetworkName string
SubnetworkURL string SubnetworkURL string
// DEPRECATED: Do not rely on this value as it may be incorrect.
SecondaryRangeName string SecondaryRangeName string
NodeTags []string NodeTags []string
NodeInstancePrefix string NodeInstancePrefix string