[2.11] Fix go mod errors & Update CI workflow

.github/workflows/verify-changes-pandaria.yaml

@@ -0,0 +1,52 @@
+name: Pandaria Verify Changes
+
+on:
+  push:
+  pull_request:
+    branches:
+      - 'release/*'
+      - 'main'
+
+jobs:
+  verify-changes:
+    name: verify-changes
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - name: Checkout
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          submodules: recursive
+
+      - name: Setup Go
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: './go.mod'
+
+      - name: Go Version
+        run: go version
+
+      - name: Generate Golang
+        run: |
+          export PATH=$PATH:/home/runner/go/bin/
+
+      - name: Setup GOPRIVATE
+        env:
+          RD_ONLY_GH_TOKEN: ${{ secrets.RD_ONLY_GH_TOKEN }}
+        run: |
+          go env -w GOPRIVATE=github.com/cnrancher
+          git config --global url."https://oauth2:${RD_ONLY_GH_TOKEN}@github.com/cnrancher".insteadOf "https://github.com/cnrancher"
+
+      - name: Verify Go Mod
+        run: ./.github/scripts/check-go-mod.sh
+
+      - name: Build Packages
+        run: ./.github/scripts/build-packages.sh
+
+      - name: Golangci Lint
+        uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
+        with:
+          # Patch version isn't needed; https://github.com/golangci/golangci-lint-action?tab=readme-ov-file#internals
+          version: v1.57
+          # Skip cache cause: https://github.com/golangci/golangci-lint-action/issues/135
+          skip-cache: true

.github/workflows/verify-changes.yaml

@@ -2,10 +2,7 @@ name: Verify Changes
 
 on:
   push:
-  pull_request:
-    branches:
-      - 'release/*'
-      - 'main'
+    branches-ignore: [ '**' ] # PANDARIA: Disabled
 
 jobs:
   verify-changes:
@@ -29,7 +26,7 @@ jobs:
       - name: Generate Golang
         run: |
           export PATH=$PATH:/home/runner/go/bin/
-      
+
       - name: Verify Go Mod
         run: ./.github/scripts/check-go-mod.sh
 
@@ -40,6 +37,6 @@ jobs:
         uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
         with:
           # Patch version isn't needed; https://github.com/golangci/golangci-lint-action?tab=readme-ov-file#internals
-          version: v1.57 
+          version: v1.57
           # Skip cache cause: https://github.com/golangci/golangci-lint-action/issues/135
           skip-cache: true

clients/aliyun/client.go

@@ -10,16 +10,16 @@ import (
 // ECSClient is a struct that wraps the needed ALIYUNECSConfig object, and ecs.ECs which makes the actual calls to aliyun.
 type ECSClient struct {
 	Client       *ecs.Client
-	ClientConfig *ALIYUNECSConfigs
+	ClientConfig *ECSConfigs
 }
 
 // NewECSClient is a constructor that creates an *ECSClient which a wrapper for a "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" session and
 // the aliyun ecs config.
 func NewECSClient() (*ECSClient, error) {
 	ecsConfig := sdk.NewConfig()
-	aliyunecsClientConfig := new(ALIYUNECSConfigs)
+	aliyunecsClientConfig := new(ECSConfigs)
 	config.LoadConfig(ConfigurationFileKey, aliyunecsClientConfig)
-	credential := credentials.NewAccessKeyCredential(aliyunecsClientConfig.ALIYUNECSAccessKeyID, aliyunecsClientConfig.ALIYUNECSSecretAccessKey)
+	credential := credentials.NewAccessKeyCredential(aliyunecsClientConfig.ECSAccessKeyID, aliyunecsClientConfig.ECSSecretAccessKey)
 	client, err := ecs.NewClientWithOptions(aliyunecsClientConfig.Region, ecsConfig, credential)
 	if err != nil {
 		return nil, err

clients/aliyun/config.go

@@ -3,16 +3,16 @@ package aliyun
 // The json/yaml config key for the ALIYUNECSConfig
 const ConfigurationFileKey = "aliyunECSConfigs"
 
-// ALIYUNECSConfigs is the AWS authentication configuration for accessing and launching ec2 instances
-type ALIYUNECSConfigs struct {
-	ALIYUNECSConfig          []ALIYUNECSConfig `json:"aliyunECSConfig" yaml:"aliyunECSConfig"`
-	ALIYUNECSAccessKeyID     string            `json:"aliyunAccessKeyID" yaml:"aliyunAccessKeyID"`
-	ALIYUNECSSecretAccessKey string            `json:"aliyunSecretAccessKey" yaml:"aliyunSecretAccessKey"`
-	Region                   string            `json:"region" yaml:"region"`
+// ECSConfigs is the AWS authentication configuration for accessing and launching ec2 instances
+type ECSConfigs struct {
+	ECSConfig          []ECSConfig `json:"aliyunECSConfig" yaml:"aliyunECSConfig"`
+	ECSAccessKeyID     string      `json:"aliyunAccessKeyID" yaml:"aliyunAccessKeyID"`
+	ECSSecretAccessKey string      `json:"aliyunSecretAccessKey" yaml:"aliyunSecretAccessKey"`
+	Region             string      `json:"region" yaml:"region"`
 }
 
-// ALIYUNECSConfig is the instance-specific configuration needed to launch ec2 instances in AWS
-type ALIYUNECSConfig struct {
+// ECSConfig is the instance-specific configuration needed to launch ec2 instances in AWS
+type ECSConfig struct {
 	ImageID                 string   `json:"imageId" yaml:"imageId"`
 	SSHPassword             string   `json:"sshPassword" yaml:"sshPassword"`
 	SSHKeyPairName          string   `json:"sshKeypair" yaml:"sshKeypair"`

clients/rancher/generated/cluster/v1beta1/zz_generated_cluster.x-k8s.io.machine.go

@@ -20,7 +20,6 @@ const (
 	MachineFieldNodeVolumeDetachTimeout = "nodeVolumeDetachTimeout"
 	MachineFieldOwnerReferences         = "ownerReferences"
 	MachineFieldProviderID              = "providerID"
-	MachineFieldReadinessGates          = "readinessGates"
 	MachineFieldRemoved                 = "removed"
 	MachineFieldState                   = "state"
 	MachineFieldStatus                  = "status"
@@ -32,28 +31,27 @@ const (
 
 type Machine struct {
 	types.Resource
-	Annotations             map[string]string      `json:"annotations,omitempty" yaml:"annotations,omitempty"`
-	Bootstrap               *Bootstrap             `json:"bootstrap,omitempty" yaml:"bootstrap,omitempty"`
-	ClusterName             string                 `json:"clusterName,omitempty" yaml:"clusterName,omitempty"`
-	Created                 string                 `json:"created,omitempty" yaml:"created,omitempty"`
-	CreatorID               string                 `json:"creatorId,omitempty" yaml:"creatorId,omitempty"`
-	FailureDomain           string                 `json:"failureDomain,omitempty" yaml:"failureDomain,omitempty"`
-	InfrastructureRef       *ObjectReference       `json:"infrastructureRef,omitempty" yaml:"infrastructureRef,omitempty"`
-	Labels                  map[string]string      `json:"labels,omitempty" yaml:"labels,omitempty"`
-	Name                    string                 `json:"name,omitempty" yaml:"name,omitempty"`
-	NodeDeletionTimeout     *Duration              `json:"nodeDeletionTimeout,omitempty" yaml:"nodeDeletionTimeout,omitempty"`
-	NodeDrainTimeout        *Duration              `json:"nodeDrainTimeout,omitempty" yaml:"nodeDrainTimeout,omitempty"`
-	NodeVolumeDetachTimeout *Duration              `json:"nodeVolumeDetachTimeout,omitempty" yaml:"nodeVolumeDetachTimeout,omitempty"`
-	OwnerReferences         []OwnerReference       `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"`
-	ProviderID              string                 `json:"providerID,omitempty" yaml:"providerID,omitempty"`
-	ReadinessGates          []MachineReadinessGate `json:"readinessGates,omitempty" yaml:"readinessGates,omitempty"`
-	Removed                 string                 `json:"removed,omitempty" yaml:"removed,omitempty"`
-	State                   string                 `json:"state,omitempty" yaml:"state,omitempty"`
-	Status                  *MachineStatus         `json:"status,omitempty" yaml:"status,omitempty"`
-	Transitioning           string                 `json:"transitioning,omitempty" yaml:"transitioning,omitempty"`
-	TransitioningMessage    string                 `json:"transitioningMessage,omitempty" yaml:"transitioningMessage,omitempty"`
-	UUID                    string                 `json:"uuid,omitempty" yaml:"uuid,omitempty"`
-	Version                 string                 `json:"version,omitempty" yaml:"version,omitempty"`
+	Annotations             map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
+	Bootstrap               *Bootstrap        `json:"bootstrap,omitempty" yaml:"bootstrap,omitempty"`
+	ClusterName             string            `json:"clusterName,omitempty" yaml:"clusterName,omitempty"`
+	Created                 string            `json:"created,omitempty" yaml:"created,omitempty"`
+	CreatorID               string            `json:"creatorId,omitempty" yaml:"creatorId,omitempty"`
+	FailureDomain           string            `json:"failureDomain,omitempty" yaml:"failureDomain,omitempty"`
+	InfrastructureRef       *ObjectReference  `json:"infrastructureRef,omitempty" yaml:"infrastructureRef,omitempty"`
+	Labels                  map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
+	Name                    string            `json:"name,omitempty" yaml:"name,omitempty"`
+	NodeDeletionTimeout     *Duration         `json:"nodeDeletionTimeout,omitempty" yaml:"nodeDeletionTimeout,omitempty"`
+	NodeDrainTimeout        *Duration         `json:"nodeDrainTimeout,omitempty" yaml:"nodeDrainTimeout,omitempty"`
+	NodeVolumeDetachTimeout *Duration         `json:"nodeVolumeDetachTimeout,omitempty" yaml:"nodeVolumeDetachTimeout,omitempty"`
+	OwnerReferences         []OwnerReference  `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"`
+	ProviderID              string            `json:"providerID,omitempty" yaml:"providerID,omitempty"`
+	Removed                 string            `json:"removed,omitempty" yaml:"removed,omitempty"`
+	State                   string            `json:"state,omitempty" yaml:"state,omitempty"`
+	Status                  *MachineStatus    `json:"status,omitempty" yaml:"status,omitempty"`
+	Transitioning           string            `json:"transitioning,omitempty" yaml:"transitioning,omitempty"`
+	TransitioningMessage    string            `json:"transitioningMessage,omitempty" yaml:"transitioningMessage,omitempty"`
+	UUID                    string            `json:"uuid,omitempty" yaml:"uuid,omitempty"`
+	Version                 string            `json:"version,omitempty" yaml:"version,omitempty"`
 }
 
 type MachineCollection struct {

clients/rancher/generated/cluster/v1beta1/zz_generated_machine_spec.go

@@ -10,19 +10,17 @@ const (
 	MachineSpecFieldNodeDrainTimeout        = "nodeDrainTimeout"
 	MachineSpecFieldNodeVolumeDetachTimeout = "nodeVolumeDetachTimeout"
 	MachineSpecFieldProviderID              = "providerID"
-	MachineSpecFieldReadinessGates          = "readinessGates"
 	MachineSpecFieldVersion                 = "version"
 )
 
 type MachineSpec struct {
-	Bootstrap               *Bootstrap             `json:"bootstrap,omitempty" yaml:"bootstrap,omitempty"`
-	ClusterName             string                 `json:"clusterName,omitempty" yaml:"clusterName,omitempty"`
-	FailureDomain           string                 `json:"failureDomain,omitempty" yaml:"failureDomain,omitempty"`
-	InfrastructureRef       *ObjectReference       `json:"infrastructureRef,omitempty" yaml:"infrastructureRef,omitempty"`
-	NodeDeletionTimeout     *Duration              `json:"nodeDeletionTimeout,omitempty" yaml:"nodeDeletionTimeout,omitempty"`
-	NodeDrainTimeout        *Duration              `json:"nodeDrainTimeout,omitempty" yaml:"nodeDrainTimeout,omitempty"`
-	NodeVolumeDetachTimeout *Duration              `json:"nodeVolumeDetachTimeout,omitempty" yaml:"nodeVolumeDetachTimeout,omitempty"`
-	ProviderID              string                 `json:"providerID,omitempty" yaml:"providerID,omitempty"`
-	ReadinessGates          []MachineReadinessGate `json:"readinessGates,omitempty" yaml:"readinessGates,omitempty"`
-	Version                 string                 `json:"version,omitempty" yaml:"version,omitempty"`
+	Bootstrap               *Bootstrap       `json:"bootstrap,omitempty" yaml:"bootstrap,omitempty"`
+	ClusterName             string           `json:"clusterName,omitempty" yaml:"clusterName,omitempty"`
+	FailureDomain           string           `json:"failureDomain,omitempty" yaml:"failureDomain,omitempty"`
+	InfrastructureRef       *ObjectReference `json:"infrastructureRef,omitempty" yaml:"infrastructureRef,omitempty"`
+	NodeDeletionTimeout     *Duration        `json:"nodeDeletionTimeout,omitempty" yaml:"nodeDeletionTimeout,omitempty"`
+	NodeDrainTimeout        *Duration        `json:"nodeDrainTimeout,omitempty" yaml:"nodeDrainTimeout,omitempty"`
+	NodeVolumeDetachTimeout *Duration        `json:"nodeVolumeDetachTimeout,omitempty" yaml:"nodeVolumeDetachTimeout,omitempty"`
+	ProviderID              string           `json:"providerID,omitempty" yaml:"providerID,omitempty"`
+	Version                 string           `json:"version,omitempty" yaml:"version,omitempty"`
 }

clients/rancher/generated/cluster/v1beta1/zz_generated_machine_status.go

@@ -6,7 +6,6 @@ const (
 	MachineStatusFieldBootstrapReady         = "bootstrapReady"
 	MachineStatusFieldCertificatesExpiryDate = "certificatesExpiryDate"
 	MachineStatusFieldConditions             = "conditions"
-	MachineStatusFieldDeletion               = "deletion"
 	MachineStatusFieldFailureMessage         = "failureMessage"
 	MachineStatusFieldFailureReason          = "failureReason"
 	MachineStatusFieldInfrastructureReady    = "infrastructureReady"
@@ -15,22 +14,19 @@ const (
 	MachineStatusFieldNodeRef                = "nodeRef"
 	MachineStatusFieldObservedGeneration     = "observedGeneration"
 	MachineStatusFieldPhase                  = "phase"
-	MachineStatusFieldV1Beta2                = "v1beta2"
 )
 
 type MachineStatus struct {
-	Addresses              []MachineAddress       `json:"addresses,omitempty" yaml:"addresses,omitempty"`
-	BootstrapReady         bool                   `json:"bootstrapReady,omitempty" yaml:"bootstrapReady,omitempty"`
-	CertificatesExpiryDate string                 `json:"certificatesExpiryDate,omitempty" yaml:"certificatesExpiryDate,omitempty"`
-	Conditions             []Condition            `json:"conditions,omitempty" yaml:"conditions,omitempty"`
-	Deletion               *MachineDeletionStatus `json:"deletion,omitempty" yaml:"deletion,omitempty"`
-	FailureMessage         string                 `json:"failureMessage,omitempty" yaml:"failureMessage,omitempty"`
-	FailureReason          string                 `json:"failureReason,omitempty" yaml:"failureReason,omitempty"`
-	InfrastructureReady    bool                   `json:"infrastructureReady,omitempty" yaml:"infrastructureReady,omitempty"`
-	LastUpdated            string                 `json:"lastUpdated,omitempty" yaml:"lastUpdated,omitempty"`
-	NodeInfo               *NodeSystemInfo        `json:"nodeInfo,omitempty" yaml:"nodeInfo,omitempty"`
-	NodeRef                *ObjectReference       `json:"nodeRef,omitempty" yaml:"nodeRef,omitempty"`
-	ObservedGeneration     int64                  `json:"observedGeneration,omitempty" yaml:"observedGeneration,omitempty"`
-	Phase                  string                 `json:"phase,omitempty" yaml:"phase,omitempty"`
-	V1Beta2                *MachineV1Beta2Status  `json:"v1beta2,omitempty" yaml:"v1beta2,omitempty"`
+	Addresses              []MachineAddress `json:"addresses,omitempty" yaml:"addresses,omitempty"`
+	BootstrapReady         bool             `json:"bootstrapReady,omitempty" yaml:"bootstrapReady,omitempty"`
+	CertificatesExpiryDate string           `json:"certificatesExpiryDate,omitempty" yaml:"certificatesExpiryDate,omitempty"`
+	Conditions             []Condition      `json:"conditions,omitempty" yaml:"conditions,omitempty"`
+	FailureMessage         string           `json:"failureMessage,omitempty" yaml:"failureMessage,omitempty"`
+	FailureReason          string           `json:"failureReason,omitempty" yaml:"failureReason,omitempty"`
+	InfrastructureReady    bool             `json:"infrastructureReady,omitempty" yaml:"infrastructureReady,omitempty"`
+	LastUpdated            string           `json:"lastUpdated,omitempty" yaml:"lastUpdated,omitempty"`
+	NodeInfo               *NodeSystemInfo  `json:"nodeInfo,omitempty" yaml:"nodeInfo,omitempty"`
+	NodeRef                *ObjectReference `json:"nodeRef,omitempty" yaml:"nodeRef,omitempty"`
+	ObservedGeneration     int64            `json:"observedGeneration,omitempty" yaml:"observedGeneration,omitempty"`
+	Phase                  string           `json:"phase,omitempty" yaml:"phase,omitempty"`
 }