chore: update Kubernetes libraries to v0.24.7

.devcontainer.json

@@ -1,6 +1,6 @@
 {
 	"name": "Go for aks-engine",
-	"image": "mcr.microsoft.com/oss/azcu/go-dev:v1.32.3",
+	"image": "mcr.microsoft.com/oss/azcu/go-dev:v1.34.7",
 	"extensions": [
 		"ms-vscode.go"
 	],

.github/workflows/nightly-build.yaml

@@ -18,7 +18,7 @@ jobs:
           docker run --rm \
           -v ${GITHUB_WORKSPACE}:/go/src/github.com/Azure/aks-engine \
           -w /go/src/github.com/Azure/aks-engine \
-          mcr.microsoft.com/oss/azcu/go-dev:v1.32.3 make dist
+          mcr.microsoft.com/oss/azcu/go-dev:v1.34.7 make dist
       - name: Rename outputs
         run: |
           mkdir ./outputs

.github/workflows/release.yaml

@@ -165,7 +165,7 @@ jobs:
           docker run --rm \
           -v ${GITHUB_WORKSPACE}:/go/src/github.com/Azure/aks-engine \
           -w /go/src/github.com/Azure/aks-engine \
-          mcr.microsoft.com/oss/azcu/go-dev:v1.32.3 make dist
+          mcr.microsoft.com/oss/azcu/go-dev:v1.34.7 make dist
       - name: Remove local tag
         run: git tag -d ${{ env.RELEASE_VERSION }}
       - name: Publish Release

.golangci.yml

@@ -13,7 +13,7 @@ linters:
     - errcheck
     - goimports
     - gosimple
-    - golint
+    - revive
     - govet
     - ineffassign
     - misspell

.pipelines/pr-e2e.yaml

@@ -17,7 +17,7 @@ pr:
 resources:
   containers:
   - container: dev1
-    image: mcr.microsoft.com/oss/azcu/go-dev:v1.32.3
+    image: mcr.microsoft.com/oss/azcu/go-dev:v1.34.7
 
 jobs:
 - job: unit_tests

.pipelines/vhd-builder-ubuntu-gen2.yaml

@@ -7,7 +7,7 @@ trigger: none
 # - POST a new SKU to azure marketplace
 
 variables:
-  CONTAINER_IMAGE:  'mcr.microsoft.com/oss/azcu/go-dev:v1.32.3'
+  CONTAINER_IMAGE:  'mcr.microsoft.com/oss/azcu/go-dev:v1.34.7'
 
 phases:
 - phase: build_vhd

.pipelines/vhd-builder.yaml

@@ -7,7 +7,7 @@ trigger: none
 # - POST a new SKU to azure marketplace
 
 variables:
-  CONTAINER_IMAGE:  'mcr.microsoft.com/oss/azcu/go-dev:v1.32.3'
+  CONTAINER_IMAGE:  'mcr.microsoft.com/oss/azcu/go-dev:v1.34.7'
 
 pool:
   vmImage: 'Ubuntu 18.04'

Makefile

@@ -28,7 +28,7 @@ ifeq ($(GITTAG),)
 GITTAG := $(VERSION_SHORT)
 endif
 
-DEV_ENV_IMAGE := mcr.microsoft.com/oss/azcu/go-dev:v1.32.3
+DEV_ENV_IMAGE := mcr.microsoft.com/oss/azcu/go-dev:v1.34.7
 DEV_ENV_WORK_DIR := /aks-engine
 DEV_ENV_OPTS := --rm -v $(GOPATH)/pkg/mod:/go/pkg/mod -v $(CURDIR):$(DEV_ENV_WORK_DIR) -w $(DEV_ENV_WORK_DIR) $(DEV_ENV_VARS)
 DEV_ENV_CMD := docker run $(DEV_ENV_OPTS) $(DEV_ENV_IMAGE)
@@ -156,7 +156,7 @@ test: generate
 	ginkgo -mod=vendor -skipPackage test/e2e -failFast -r -v -tags=fast -ldflags '$(LDFLAGS)' .
 
 .PHONY: test-style
-test-style: validate-go validate-shell validate-copyright-headers
+test-style: validate-go validate-copyright-headers
 
 .PHONY: ensure-generated
 ensure-generated:

cmd/get_locations.go

@@ -109,8 +109,8 @@ func (glc *LocationsCmd) run(cmd *cobra.Command, args []string) error {
 		}
 	}
 	if !outputFlagValid {
-		return errors.New(fmt.Sprintf("invalid output format: \"%s\". Allowed values: %s.\n",
-			glc.output, strings.Join(locationsOutputFormatOptions, ", ")))
+		return fmt.Errorf("invalid output format: \"%s\". Allowed values: %s",
+			glc.output, strings.Join(locationsOutputFormatOptions, ", "))
 	}
 
 	if err = glc.getAuthArgs().validateAuthArgs(); err != nil {
@@ -287,8 +287,6 @@ package helpers
 //
 // To generate this code, run the command:
 //   aks-engine get-locations --output=code
-func GetAzureLocations() []string {
-	return []string{
 `)
 		for _, l := range locations {
 			b.WriteString(fmt.Sprintf("\t\t\"%s\",\n", *l.Name))

cmd/get_locations_test.go

@@ -264,71 +264,6 @@ func ExampleLocationsCmd_run_jsonOutput() {
 	// ]
 }
 
-func ExampleLocationsCmd_run_codeOutput() {
-	d := &LocationsCmd{
-		client: &armhelpers.MockAKSEngineClient{},
-		authProvider: &mockAuthProvider{
-			authArgs:      &authArgs{},
-			getClientMock: &armhelpers.MockAKSEngineClient{},
-		},
-	}
-
-	r := &cobra.Command{}
-	f := r.Flags()
-
-	addAuthFlags(d.getAuthArgs(), f)
-
-	fakeRawSubscriptionID := "6dc93fae-9a76-421f-bbe5-cc6460ea81cb"
-	fakeSubscriptionID, _ := uuid.Parse(fakeRawSubscriptionID)
-	fakeClientID := "b829b379-ca1f-4f1d-91a2-0d26b244680d"
-	fakeClientSecret := "0se43bie-3zs5-303e-aav5-dcf231vb82ds"
-
-	d.getAuthArgs().SubscriptionID = fakeSubscriptionID
-	d.getAuthArgs().rawSubscriptionID = fakeRawSubscriptionID
-	d.getAuthArgs().rawClientID = fakeClientID
-	d.getAuthArgs().ClientSecret = fakeClientSecret
-
-	args := []string{}
-
-	d.output = "code"
-	if err := d.run(r, args); err != nil {
-		fmt.Printf("error running command: %s\n", err)
-	}
-
-	// Output:
-	// // Copyright (c) Microsoft Corporation. All rights reserved.
-	// // Licensed under the MIT license.
-
-	// package helpers
-
-	// // GetAzureLocations provides all available Azure cloud locations.
-	// //
-	// // Code generated for package helpers by aks-engine DO NOT EDIT. (@generated)
-	// //
-	// // To generate this code, run the command:
-	// //   aks-engine get-locations --output=code
-	// func GetAzureLocations() []string {
-	// 	return []string{
-	// 		"centraluseuap",
-	// 		"chinaeast",
-	// 		"chinaeast2",
-	// 		"chinaeast3",
-	// 		"chinanorth",
-	// 		"chinanorth2",
-	// 		"chinanorth3",
-	// 		"eastus2euap",
-	// 		"germanycentral",
-	// 		"germanynortheast",
-	// 		"usdodcentral",
-	// 		"usdodeast",
-	// 		"usgovarizona",
-	// 		"usgoviowa",
-	// 		"usgovtexas",
-	// 		"usgovvirginia",
-	// 	 }
-	// }
-}
-
 func TestGetLocationsCmd_ShouldErrorIfInvalidOption(t *testing.T) {
 	t.Parallel()
 
@@ -338,5 +273,5 @@ func TestGetLocationsCmd_ShouldErrorIfInvalidOption(t *testing.T) {
 	err := command.run(nil, nil)
 	g := NewGomegaWithT(t)
 	g.Expect(err).To(HaveOccurred())
-	g.Expect(err.Error()).To(Equal("invalid output format: \"yaml\". Allowed values: human, json, code.\n"))
+	g.Expect(err.Error()).To(Equal("invalid output format: \"yaml\". Allowed values: human, json, code"))
 }

cmd/get_skus.go

@@ -73,8 +73,8 @@ func (vmc *SkusCmd) run(cmd *cobra.Command, args []string) error {
 		}
 	}
 	if !outputFlagValid {
-		return errors.New(fmt.Sprintf("invalid output format: \"%s\". Allowed values: %s.\n",
-			vmc.output, strings.Join(skusOutputFormatOptions, ", ")))
+		return fmt.Errorf("invalid output format: \"%s\". Allowed values: %s",
+			vmc.output, strings.Join(skusOutputFormatOptions, ", "))
 	}
 
 	if err = vmc.getAuthArgs().validateAuthArgs(); err != nil {

cmd/get_skus_test.go

@@ -105,5 +105,5 @@ func TestGetSkusCmd_ShouldErrorIfInvalidOption(t *testing.T) {
 	err := command.run(nil, nil)
 	g := NewGomegaWithT(t)
 	g.Expect(err).To(HaveOccurred())
-	g.Expect(err.Error()).To(Equal("invalid output format: \"yaml\". Allowed values: human, json, code.\n"))
+	g.Expect(err.Error()).To(Equal("invalid output format: \"yaml\". Allowed values: human, json, code"))
 }

cmd/root.go

@@ -135,7 +135,7 @@ func addAuthFlags(authArgs *authArgs, f *flag.FlagSet) {
 	f.StringVar(&authArgs.language, "language", "en-us", "language to return error messages in")
 }
 
-//this allows the authArgs to be stubbed behind the authProvider interface, and be its own provider when not in tests.
+// getAuthArgs allows the authArgs to be stubbed behind the authProvider interface, and be its own provider when not in tests.
 func (authArgs *authArgs) getAuthArgs() *authArgs {
 	return authArgs
 }

cmd/root_test.go

@@ -25,16 +25,13 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-//mockAuthProvider implements AuthProvider and allows in particular to stub out getClient()
+// mockAuthProvider implements AuthProvider and allows in particular to stub out getClient()
 type mockAuthProvider struct {
 	getClientMock armhelpers.AKSEngineClient
 	*authArgs
 }
 
 func (provider *mockAuthProvider) getClient() (armhelpers.AKSEngineClient, error) {
-	if provider.getClientMock == nil {
-		return &armhelpers.MockAKSEngineClient{}, nil
-	}
 	return provider.getClientMock, nil
 
 }
@@ -216,7 +213,7 @@ func TestWriteCustomCloudProfile(t *testing.T) {
 		t.Fatalf("failed to write custom cloud profile: can not read file %s ", environmentFilePath)
 	}
 	azurestackenvironmentStr := string(azurestackenvironment)
-	expectedResult := `{"name":"azurestackcloud","managementPortalURL":"https://management.local.azurestack.external/","publishSettingsURL":"https://management.local.azurestack.external/publishsettings/index","serviceManagementEndpoint":"https://management.azurestackci15.onmicrosoft.com/36f71706-54df-4305-9847-5b038a4cf189","resourceManagerEndpoint":"https://management.local.azurestack.external/","activeDirectoryEndpoint":"https://login.windows.net/","galleryEndpoint":"https://portal.local.azurestack.external=30015/","keyVaultEndpoint":"https://vault.azurestack.external/","graphEndpoint":"https://graph.windows.net/","serviceBusEndpoint":"https://servicebus.azurestack.external/","batchManagementEndpoint":"https://batch.azurestack.external/","storageEndpointSuffix":"core.azurestack.external","sqlDatabaseDNSSuffix":"database.azurestack.external","trafficManagerDNSSuffix":"trafficmanager.cn","keyVaultDNSSuffix":"vault.azurestack.external","serviceBusEndpointSuffix":"servicebus.azurestack.external","serviceManagementVMDNSSuffix":"chinacloudapp.cn","resourceManagerVMDNSSuffix":"cloudapp.azurestack.external","containerRegistryDNSSuffix":"azurecr.io","cosmosDBDNSSuffix":"","tokenAudience":"https://management.azurestack.external/","resourceIdentifiers":{"graph":"","keyVault":"","datalake":"","batch":"","operationalInsights":"","storage":""}}`
+	expectedResult := `{"name":"azurestackcloud","managementPortalURL":"https://management.local.azurestack.external/","publishSettingsURL":"https://management.local.azurestack.external/publishsettings/index","serviceManagementEndpoint":"https://management.azurestackci15.onmicrosoft.com/36f71706-54df-4305-9847-5b038a4cf189","resourceManagerEndpoint":"https://management.local.azurestack.external/","activeDirectoryEndpoint":"https://login.windows.net/","galleryEndpoint":"https://portal.local.azurestack.external=30015/","keyVaultEndpoint":"https://vault.azurestack.external/","graphEndpoint":"https://graph.windows.net/","serviceBusEndpoint":"https://servicebus.azurestack.external/","batchManagementEndpoint":"https://batch.azurestack.external/","storageEndpointSuffix":"core.azurestack.external","sqlDatabaseDNSSuffix":"database.azurestack.external","trafficManagerDNSSuffix":"trafficmanager.cn","keyVaultDNSSuffix":"vault.azurestack.external","serviceBusEndpointSuffix":"servicebus.azurestack.external","serviceManagementVMDNSSuffix":"chinacloudapp.cn","resourceManagerVMDNSSuffix":"cloudapp.azurestack.external","containerRegistryDNSSuffix":"azurecr.io","cosmosDBDNSSuffix":"","tokenAudience":"https://management.azurestack.external/","apiManagementHostNameSuffix":"","synapseEndpointSuffix":"","resourceIdentifiers":{"graph":"","keyVault":"","datalake":"","batch":"","operationalInsights":"","storage":"","synapse":"","serviceBus":""}}`
 	if azurestackenvironmentStr != expectedResult {
 		t.Fatalf("failed to write custom cloud profile: expected %s , got %s ", expectedResult, azurestackenvironmentStr)
 	}

cmd/rotatecerts/operations_test.go

@@ -64,7 +64,7 @@ func TestPauseClusterAutoscaler(t *testing.T) {
 		mockCtrl := gomock.NewController(t)
 		defer mockCtrl.Finish()
 
-		var replicas int32 = 0
+		var replicas int32
 		deploy := appsv1.Deployment{}
 		deploy.Spec.Replicas = &replicas
 		mock := mock.NewMockKubeClient(mockCtrl)

cmd/upgrade.go

@@ -175,14 +175,14 @@ func (uc *upgradeCmd) loadCluster() error {
 
 	// Ensure there aren't known-breaking API model configurations
 	if uc.containerService.Properties.MasterProfile.AvailabilityProfile == api.VirtualMachineScaleSets {
-		return errors.Errorf("Clusters with a VMSS control plane are not upgradable using `aks-engine upgrade`!")
+		return errors.Errorf("clusters with a VMSS control plane are not upgradable using `aks-engine upgrade`")
 	}
 	if uc.containerService.Properties.OrchestratorProfile != nil &&
 		uc.containerService.Properties.OrchestratorProfile.KubernetesConfig != nil &&
 		to.Bool(uc.containerService.Properties.OrchestratorProfile.KubernetesConfig.EnableEncryptionWithExternalKms) &&
 		to.Bool(uc.containerService.Properties.OrchestratorProfile.KubernetesConfig.UseManagedIdentity) &&
 		uc.containerService.Properties.OrchestratorProfile.KubernetesConfig.UserAssignedID == "" {
-		return errors.Errorf("Clusters with enableEncryptionWithExternalKms=true and system-assigned identity are not upgradable using `aks-engine upgrade`!")
+		return errors.Errorf("clusters with enableEncryptionWithExternalKms=true and system-assigned identity are not upgradable using `aks-engine upgrade`")
 	}
 
 	// Set 60 minutes cordonDrainTimeout for Azure Stack Cloud to give it enough time to move around resources during Node Drain,

go.mod

@@ -1,54 +1,100 @@
 module github.com/Azure/aks-engine
 
-go 1.16
+go 1.17
 
 require (
 	github.com/Azure/azure-sdk-for-go v43.0.0+incompatible
 	github.com/Azure/azure-storage-blob-go v0.7.0
-	github.com/Azure/go-autorest/autorest v0.9.6
-	github.com/Azure/go-autorest/autorest/adal v0.9.10
+	github.com/Azure/go-autorest/autorest v0.11.18
+	github.com/Azure/go-autorest/autorest/adal v0.9.13
 	github.com/Azure/go-autorest/autorest/azure/cli v0.3.0
 	github.com/Azure/go-autorest/autorest/date v0.3.0
 	github.com/Azure/go-autorest/autorest/to v0.3.0
-	github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
 	github.com/BurntSushi/toml v0.3.1
 	github.com/Jeffail/gabs v1.1.1
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/davecgh/go-spew v1.1.1
-	github.com/dnaeon/go-vcr v1.0.1 // indirect
 	github.com/fatih/structs v1.1.0
-	github.com/go-playground/locales v0.12.1 // indirect
-	github.com/go-playground/universal-translator v0.16.0 // indirect
-	github.com/golang/mock v1.2.0
-	github.com/google/go-cmp v0.4.0
-	github.com/google/uuid v1.1.1
-	github.com/googleapis/gnostic v0.2.0 // indirect
+	github.com/golang/mock v1.5.0
+	github.com/google/go-cmp v0.5.5
+	github.com/google/uuid v1.1.2
 	github.com/imdario/mergo v0.3.6
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jarcoal/httpmock v1.0.1
-	github.com/kr/pretty v0.2.1 // indirect
-	github.com/leodido/go-urn v1.1.0 // indirect
 	github.com/leonelquinteros/gotext v1.4.0
 	github.com/mattn/go-colorable v0.0.9
-	github.com/mattn/go-isatty v0.0.10 // indirect
-	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/onsi/ginkgo v1.15.0
 	github.com/onsi/gomega v1.10.1
 	github.com/pkg/errors v0.9.1
-	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/sirupsen/logrus v1.8.0
-	github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
 	github.com/spf13/cobra v0.0.3
 	github.com/spf13/pflag v1.0.5
 	github.com/x-cray/logrus-prefixed-formatter v0.5.2
-	golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
-	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
-	golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 // indirect
-	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
+	golang.org/x/crypto v0.0.0-20220214200702-86341886e292
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	gopkg.in/go-playground/validator.v9 v9.25.0
 	gopkg.in/ini.v1 v1.41.0
-	k8s.io/api v0.16.15
-	k8s.io/apimachinery v0.16.15
-	k8s.io/client-go v0.16.15
+	k8s.io/api v0.24.7
+	k8s.io/apimachinery v0.24.7
+	k8s.io/client-go v0.24.7
+)
+
+require (
+	github.com/Azure/azure-pipeline-go v0.2.1 // indirect
+	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
+	github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
+	github.com/Azure/go-autorest/logger v0.2.1 // indirect
+	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/dimchansky/utfbom v1.1.0 // indirect
+	github.com/dnaeon/go-vcr v1.0.1 // indirect
+	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
+	github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/go-logr/logr v1.2.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/go-playground/locales v0.12.1 // indirect
+	github.com/go-playground/universal-translator v0.16.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/leodido/go-urn v1.1.0 // indirect
+	github.com/magefile/mage v1.10.0 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149 // indirect
+	github.com/mattn/go-isatty v0.0.10 // indirect
+	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/nxadm/tail v1.4.4 // indirect
+	github.com/satori/go.uuid v1.2.0 // indirect
+	github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
+	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
+	golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/klog/v2 v2.60.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
+	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
+	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
 )