Skip to content

Commit 58416f3

Browse files
authored
Merge pull request kubernetes#92188 from gongguan/revert-instance-meta
revert InstanceMetadataByProviderID definition and related deprecations
2 parents c83c4d5 + 70d49ff commit 58416f3

File tree

1 file changed

+0
-5
lines changed
  • staging/src/k8s.io/cloud-provider

1 file changed

+0
-5
lines changed

staging/src/k8s.io/cloud-provider/cloud.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ type Instances interface {
163163
// ProviderID is a unique identifier of the node. This will not be called
164164
// from the node whose nodeaddresses are being queried. i.e. local metadata
165165
// services cannot be used in this method to obtain nodeaddresses
166-
// Deprecated: Remove once all calls are migrated to InstanceMetadataByProviderID
167166
NodeAddressesByProviderID(ctx context.Context, providerID string) ([]v1.NodeAddress, error)
168167
// InstanceID returns the cloud provider ID of the node with the specified NodeName.
169168
// Note that if the instance does not exist, we must return ("", cloudprovider.InstanceNotFound)
@@ -172,7 +171,6 @@ type Instances interface {
172171
// InstanceType returns the type of the specified instance.
173172
InstanceType(ctx context.Context, name types.NodeName) (string, error)
174173
// InstanceTypeByProviderID returns the type of the specified instance.
175-
// Deprecated: Remove once all calls are migrated to InstanceMetadataByProviderID
176174
InstanceTypeByProviderID(ctx context.Context, providerID string) (string, error)
177175
// AddSSHKeyToAllInstances adds an SSH public key as a legal identity for all instances
178176
// expected format for the key is standard ssh-keygen format: <protocol> <blob>
@@ -183,12 +181,9 @@ type Instances interface {
183181
// InstanceExistsByProviderID returns true if the instance for the given provider exists.
184182
// If false is returned with no error, the instance will be immediately deleted by the cloud controller manager.
185183
// This method should still return true for instances that exist but are stopped/sleeping.
186-
// Deprecated: Remove once all calls are migrated to InstanceMetadataByProviderID
187184
InstanceExistsByProviderID(ctx context.Context, providerID string) (bool, error)
188185
// InstanceShutdownByProviderID returns true if the instance is shutdown in cloudprovider
189186
InstanceShutdownByProviderID(ctx context.Context, providerID string) (bool, error)
190-
// InstanceMetadataByProviderID returns the instance's metadata.
191-
InstanceMetadataByProviderID(ctx context.Context, providerID string) (*InstanceMetadata, error)
192187
}
193188

194189
// Route is a representation of an advanced routing rule.

0 commit comments

Comments
 (0)