Azure
/
aks-engine
зеркало из https://github.com/Azure/aks-engine.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

feat: Deprecate Kubernetes versions 1.19 and 1.20 (#4894)

This commit is contained in:
Jack Francis 2022-06-06 11:43:42 -07:00 коммит произвёл GitHub
Родитель 817e01db1c
Коммит 2754521e6b
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
24 изменённых файлов: 23 добавлений и 395 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
.github/workflows/release.yaml поставляемый
Просмотреть файл

@ -50,22 +50,6 @@ jobs:
- name: print git status after build
run: |
git status
- name: Validate 1.20 no-egress scenario
env:
ORCHESTRATOR_RELEASE: "1.20"
CLUSTER_DEFINITION: "examples/no_outbound.json"
SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
CLIENT_SECRET: ${{ secrets.TEST_AZURE_SP_PW }}
LOCATION: "westus2"
TENANT_ID: ${{ secrets.TEST_AZURE_TENANT_ID }}
CLEANUP_ON_EXIT: true
CLEANUP_IF_FAIL: true
SKIP_LOGS_COLLECTION: true
SKIP_TEST: true
AZURE_CORE_ONLY_SHOW_ERRORS: True
BLOCK_SSH: true
run: make test-kubernetes
- name: Validate 1.21 no-egress scenario
env:
ORCHESTRATOR_RELEASE: "1.21"

40
.pipelines/pr-e2e.yaml
Просмотреть файл

@ -63,26 +63,6 @@ jobs:
- script: make test
displayName: Run unit tests
- template: e2e-job-template.yaml
parameters:
name: 'k8s_1_19_docker_e2e'
k8sRelease: '1.19'
apimodel: 'examples/e2e-tests/kubernetes/release/default/definition.json'
createVNET: true
enableKMSEncryption: false
containerRuntime: 'docker'
runSSHTests: true
- template: e2e-job-template.yaml
parameters:
name: 'k8s_1_20_docker_e2e'
k8sRelease: '1.20'
apimodel: 'examples/e2e-tests/kubernetes/release/default/definition.json'
createVNET: true
enableKMSEncryption: false
containerRuntime: 'docker'
runSSHTests: true
- template: e2e-job-template.yaml
parameters:
name: 'k8s_1_21_docker_e2e'
@ -113,26 +93,6 @@ jobs:
containerRuntime: 'docker'
runSSHTests: true
- template: e2e-job-template.yaml
parameters:
name: 'k8s_1_19_containerd_e2e'
k8sRelease: '1.19'
apimodel: 'examples/e2e-tests/kubernetes/release/default/definition-no-vnet.json'
createVNET: false
enableKMSEncryption: false
containerRuntime: 'containerd'
runSSHTests: true
- template: e2e-job-template.yaml
parameters:
name: 'k8s_1_20_containerd_e2e'
k8sRelease: '1.20'
apimodel: 'examples/e2e-tests/kubernetes/release/default/definition-no-vnet.json'
createVNET: false
enableKMSEncryption: false
containerRuntime: 'containerd'
runSSHTests: true
- template: e2e-job-template.yaml
parameters:
name: 'k8s_1_21_containerd_e2e'

2
.pipelines/vhd-builder-windows-template.yaml
Просмотреть файл

@ -49,7 +49,7 @@ jobs:
-e CLIENT_SECRET="$(CLIENT_SECRET)" \
-e CLUSTER_DEFINITION="examples/e2e-tests/kubernetes/windows/hybrid/definition.json" \
-e LOCATION=${AZURE_LOCATION} \
-e ORCHESTRATOR_RELEASE="1.20" \
-e ORCHESTRATOR_RELEASE="1.23" \
-e SUBSCRIPTION_ID=${SUBSCRIPTION_ID} \
-e TENANT_ID=${TENANT_ID} \
-e WINDOWS_NODE_VHD_URL=${OS_DISK_URI} \

2
Jenkinsfile поставляемый
Просмотреть файл

@ -6,7 +6,7 @@ defaultEnv = [
VALIDATE_CPU_LOAD: false,
] + params
def k8sVersions = ["1.19", "1.20", "1.21", "1.22", "1.23", "1.24"]
def k8sVersions = ["1.21", "1.22", "1.23", "1.24"]
def latestReleasedVersion = "1.24"
def tasks = [:]
def testConfigs = []

43
cmd/deploy_test.go
Просмотреть файл

@ -783,49 +783,6 @@ func TestLoadApiModelOnAzureStack(t *testing.T) {
}
}
func TestLoadApiModelOnAzureStackWithAKSUbuntu1604Distro(t *testing.T) {
t.Parallel()
outdir, del := makeTmpDir(t)
defer del()
d := &deployCmd{
client: &armhelpers.MockAKSEngineClient{},
authProvider: &mockAuthProvider{
authArgs: &authArgs{},
getClientMock: &armhelpers.MockAKSEngineClient{},
},
apimodelPath: "../pkg/engine/testdata/azurestack/kubernetes-ubuntu16.json",
outputDirectory: outdir,
forceOverwrite: true,
location: "westus",
}
r := &cobra.Command{}
f := r.Flags()
addAuthFlags(d.getAuthArgs(), f)
d.location = "local"
fakeRawSubscriptionID := "6dc93fae-9a76-421f-bbe5-cc6460ea81cb"
fakeSubscriptionID, err := uuid.Parse(fakeRawSubscriptionID)
fakeClientID := "b829b379-ca1f-4f1d-91a2-0d26b244680d"
fakeClientSecret := "0se43bie-3zs5-303e-aav5-dcf231vb82ds"
if err != nil {
t.Fatalf("Invalid SubscriptionId in Test: %s", err)
}
d.getAuthArgs().IdentitySystem = "adfs"
d.getAuthArgs().SubscriptionID = fakeSubscriptionID
d.getAuthArgs().rawSubscriptionID = fakeRawSubscriptionID
d.getAuthArgs().rawClientID = fakeClientID
d.getAuthArgs().ClientSecret = fakeClientSecret
err = d.loadAPIModel()
if err != nil && err.Error() != errors.New("invalid master profile distro 'aks-ubuntu-16.04'").Error() {
t.Fatalf("Failed to identify invalid distro 'aks-ubuntu-16.04': %s", err)
}
}
func TestOutputDirectoryWithDNSPrefix(t *testing.T) {
t.Parallel()

10
cmd/generate_test.go
Просмотреть файл

@ -562,16 +562,6 @@ func TestExampleAPIModels(t *testing.T) {
apiModelPath: "../examples/kubernetes-msi-userassigned/kube-vmss.json",
setArgs: defaultSet,
},
{
name: "1.19 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.19.json",
setArgs: defaultSet,
},
{
name: "1.20 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.20.json",
setArgs: defaultSet,
},
{
name: "1.21 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.21.json",

8
examples/dualstack/kubernetes-iptables.json
Просмотреть файл

@ -6,22 +6,14 @@
},
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.20",
"kubernetesConfig": {
"clusterSubnet": "10.244.0.0/16,fc00::/48",
"serviceCidr": "10.0.0.0/16,fd00::/108",
"dnsServiceIP": "10.0.0.10",
"kubeProxyMode": "iptables",
"networkPlugin": "kubenet",
"apiServerConfig": {
"--feature-gates": "IPv6DualStack=true"
},
"kubeletConfig": {
"--feature-gates": "IPv6DualStack=true",
"--max-pods": "110"
},
"controllerManagerConfig": {
"--feature-gates": "IPv6DualStack=true"
}
}
},

10
examples/dualstack/kubernetes-windows.json
Просмотреть файл

@ -5,17 +5,7 @@
"enableIPv6DualStack": true
},
"orchestratorProfile": {
"orchestratorRelease": "1.19",
"kubernetesConfig": {
"apiServerConfig": {
"--feature-gates": "IPv6DualStack=true"
},
"kubeletConfig": {
"--feature-gates": "IPv6DualStack=true"
},
"controllerManagerConfig": {
"--feature-gates": "IPv6DualStack=true"
},
"kubeProxyMode": "ipvs",
"networkPlugin": "azure",
"networkMode": "bridge",

9
examples/dualstack/kubernetes.json
Просмотреть файл

@ -5,23 +5,15 @@
"enableIPv6DualStack": true
},
"orchestratorProfile": {
"orchestratorRelease": "1.20",
"kubernetesConfig": {
"clusterSubnet": "10.244.0.0/16,fc00::/48",
"serviceCidr": "10.0.0.0/16,fd00::/108",
"dnsServiceIP": "10.0.0.10",
"kubeProxyMode": "ipvs",
"networkPlugin": "kubenet",
"apiServerConfig": {
"--feature-gates": "IPv6DualStack=true"
},
"kubeletConfig": {
"--feature-gates": "IPv6DualStack=true",
"--hairpin-mode": "hairpin-veth",
"--max-pods": "110"
},
"controllerManagerConfig": {
"--feature-gates": "IPv6DualStack=true"
}
}
},
@ -52,4 +44,3 @@
}
}
}

1
examples/ipv6/kubernetes.json
Просмотреть файл

@ -5,7 +5,6 @@
"enableIPv6Only": true
},
"orchestratorProfile": {
"orchestratorRelease": "1.19",
"kubernetesConfig": {
"loadBalancerSku": "Standard",
"excludeMasterFromStandardLB": true,

30
examples/kubernetes-releases/kubernetes1.19.json
Просмотреть файл

@ -1,30 +0,0 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.19"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v3"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
}
}
}

30
examples/kubernetes-releases/kubernetes1.20.json
Просмотреть файл

@ -1,30 +0,0 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.20"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v3"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
}
}
}

7
examples/kubernetes.json
Просмотреть файл

@ -4,16 +4,19 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v3"
"vmSize": "Standard_D2_v3",
"distro": "ubuntu-18.04"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 2,
"vmSize": "Standard_D2_v3"
"vmSize": "Standard_D2_v3",
"distro": "ubuntu-18.04"
}
],
"linuxProfile": {
"runUnattendedUpgradesOnBootstrap": false,
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [

19
parts/k8s/addons/container-monitoring.yaml
Просмотреть файл

@ -852,8 +852,6 @@ spec:
port: 25227
targetPort: in-rs-tcp
---
# this is for versions >=1.19, for versions <1.19 we continue to use v1beta1
{{- if IsKubernetesVersionGe "1.19.0"}}
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
@ -875,20 +873,3 @@ spec:
names:
plural: healthstates
kind: HealthState
{{- else }}
apiVersion: {{GetCRDAPIVersion}}
kind: CustomResourceDefinition
metadata:
name: healthstates.azmon.container.insights
namespace: kube-system
labels:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
spec:
group: azmon.container.insights
version: v1
scope: Namespaced
names:
plural: healthstates
kind: HealthState
{{end}}

2
parts/k8s/addons/metrics-server.yaml
Просмотреть файл

@ -184,7 +184,7 @@ spec:
- emptyDir: {}
name: tmp-dir
---
apiVersion: apiregistration.k8s.io/v1{{- if not (IsKubernetesVersionGe "1.19.0")}}beta1{{end}}
apiVersion: apiregistration.k8s.io/v1
kind: APIService
metadata:
labels:

4
pkg/api/common/const.go
Просмотреть файл

@ -57,9 +57,9 @@ const (
const (
// KubernetesDefaultRelease is the default Kubernetes release
KubernetesDefaultRelease string = "1.19"
KubernetesDefaultRelease string = "1.23"
// KubernetesDefaultReleaseWindows is the default Kubernetes release for Windows
KubernetesDefaultReleaseWindows string = "1.19"
KubernetesDefaultReleaseWindows string = "1.23"
// KubernetesDefaultReleaseAzureStack is the default Kubernetes release on Azure Stack
KubernetesDefaultReleaseAzureStack string = "1.21"
// KubernetesDefaultReleaseWindowsAzureStack is the default Kubernetes release for Windows on Azure Stack

2
pkg/api/common/versions.go
Просмотреть файл

@ -249,7 +249,7 @@ var AllKubernetesSupportedVersions = map[string]bool{
"1.19.13": false,
"1.19.14": false,
"1.19.15": false,
"1.19.16": true,
"1.19.16": false,
"1.20.0-alpha.1": false,
"1.20.0-alpha.2": false,
"1.20.0-alpha.3": false,

22
pkg/api/defaults-apiserver_test.go
Просмотреть файл

@ -301,38 +301,26 @@ func TestAPIServerConfigDisableRbac(t *testing.T) {
}
func TestAPIServerServiceAccountFlags(t *testing.T) {
cs := CreateMockContainerService("testcluster", common.RationalizeReleaseAndVersion(Kubernetes, "1.20", "", false, false, false), 3, 2, false)
cs := CreateMockContainerService("testcluster", common.RationalizeReleaseAndVersion(Kubernetes, "1.23", "", false, false, false), 3, 2, false)
cs.setAPIServerConfig()
a := cs.Properties.OrchestratorProfile.KubernetesConfig.APIServerConfig
if a["--service-account-issuer"] != "https://kubernetes.default.svc.cluster.local" {
t.Fatalf("got unexpected '--service-account-issuer' API server config value for Kubernetes v1.20: %s",
t.Fatalf("got unexpected '--service-account-issuer' API server config value for Kubernetes v1.23: %s",
a["--service-account-issuer"])
}
if a["--service-account-signing-key-file"] != "/etc/kubernetes/certs/apiserver.key" {
t.Fatalf("got unexpected '--service-account-signing-key-file' API server config value for Kubernetes v1.20: %s",
t.Fatalf("got unexpected '--service-account-signing-key-file' API server config value for Kubernetes v1.23: %s",
a["--service-account-signing-key-file"])
}
cs = CreateMockContainerService("testcluster", common.RationalizeReleaseAndVersion(Kubernetes, "1.19", "", false, false, false), 3, 2, false)
cs.setAPIServerConfig()
a = cs.Properties.OrchestratorProfile.KubernetesConfig.APIServerConfig
if a["--service-account-issuer"] != "" {
t.Fatalf("got unexpected '--service-account-issuer' API server config value for Kubernetes v1.20: %s",
a["--service-account-issuer"])
}
if a["--service-account-signing-key-file"] != "" {
t.Fatalf("got unexpected '--service-account-signing-key-file' API server config value for Kubernetes v1.20: %s",
a["--service-account-signing-key-file"])
}
cs = CreateMockContainerService("testcluster", common.RationalizeReleaseAndVersion(Kubernetes, "1.20", "", false, false, false), 3, 2, false)
cs = CreateMockContainerService("testcluster", common.RationalizeReleaseAndVersion(Kubernetes, "1.23", "", false, false, false), 3, 2, false)
cs.Properties.OrchestratorProfile.KubernetesConfig.APIServerConfig = map[string]string{
"--service-account-issuer": "kubernetes.default.svc",
}
cs.setAPIServerConfig()
a = cs.Properties.OrchestratorProfile.KubernetesConfig.APIServerConfig
if a["--service-account-issuer"] != "https://kubernetes.default.svc.cluster.local" {
t.Fatalf("got unexpected '--service-account-issuer' API server config value for Kubernetes v1.20: %s",
t.Fatalf("got unexpected '--service-account-issuer' API server config value for Kubernetes v1.23: %s",
a["--service-account-issuer"])
}
}

26
pkg/api/defaults-kubelet_test.go
Просмотреть файл

@ -234,7 +234,7 @@ func getDefaultLinuxKubeletConfig(cs *ContainerService) map[string]string {
"--read-only-port": "0",
"--rotate-certificates": "true",
"--streaming-connection-idle-timeout": "4h",
"--feature-gates": "RotateKubeletServerCertificate=true",
"--feature-gates": "ExecProbeTimeout=true,RotateKubeletServerCertificate=true",
"--tls-cipher-suites": TLSStrongCipherSuitesKubelet,
"--tls-cert-file": "/etc/kubernetes/certs/kubeletserver.crt",
"--tls-private-key-file": "/etc/kubernetes/certs/kubeletserver.key",
@ -273,7 +273,7 @@ func TestKubeletConfigAzureStackDefaults(t *testing.T) {
"--enforce-node-allocatable": "pods",
"--event-qps": DefaultKubeletEventQPS,
"--eviction-hard": DefaultKubernetesHardEvictionThreshold,
"--feature-gates": "RotateKubeletServerCertificate=true",
"--feature-gates": "ExecProbeTimeout=true,RotateKubeletServerCertificate=true",
"--image-gc-high-threshold": strconv.Itoa(DefaultKubernetesGCHighThreshold),
"--image-gc-low-threshold": strconv.Itoa(DefaultKubernetesGCLowThreshold),
"--image-pull-progress-deadline": "30m",
@ -948,27 +948,9 @@ func TestKubeletRotateCertificates(t *testing.T) {
}
}
func TestKubeletConfigDefaultFeatureGates(t *testing.T) {
// test 1.16
cs := CreateMockContainerService("testcluster", common.RationalizeReleaseAndVersion(Kubernetes, "1.18", "", false, false, false), 3, 2, false)
cs.setKubeletConfig(false)
k := cs.Properties.OrchestratorProfile.KubernetesConfig.KubeletConfig
if k["--feature-gates"] != "RotateKubeletServerCertificate=true" {
t.Fatalf("got unexpected '--feature-gates' kubelet config value for \"--feature-gates\": \"\": %s",
k["--feature-gates"])
}
// test 1.20
cs = CreateMockContainerService("testcluster", common.RationalizeReleaseAndVersion(Kubernetes, "1.20", "", false, false, false), 3, 2, false)
cs.setKubeletConfig(false)
k = cs.Properties.OrchestratorProfile.KubernetesConfig.KubeletConfig
if k["--feature-gates"] != "ExecProbeTimeout=true,RotateKubeletServerCertificate=true" {
t.Fatalf("got unexpected '--feature-gates' kubelet config value for \"--feature-gates\": \"\": %s",
k["--feature-gates"])
}
// test user-overrides
cs = CreateMockContainerService("testcluster", "", 3, 2, false)
k = cs.Properties.OrchestratorProfile.KubernetesConfig.KubeletConfig
cs := CreateMockContainerService("testcluster", "", 3, 2, false)
k := cs.Properties.OrchestratorProfile.KubernetesConfig.KubeletConfig
k["--feature-gates"] = "DynamicKubeletConfig=true,ExecProbeTimeout=false"
cs.setKubeletConfig(false)
if k["--feature-gates"] != "DynamicKubeletConfig=true,ExecProbeTimeout=false,RotateKubeletServerCertificate=true" {

4
pkg/api/defaults_test.go
Просмотреть файл

@ -3661,12 +3661,12 @@ func TestCloudProviderBackoff(t *testing.T) {
},
},
{
name: "Kubernetes 1.19.15",
name: "Kubernetes 1.23.5",
cs: ContainerService{
Properties: &Properties{
OrchestratorProfile: &OrchestratorProfile{
OrchestratorType: Kubernetes,
OrchestratorVersion: "1.19.15",
OrchestratorVersion: common.RationalizeReleaseAndVersion(Kubernetes, "", "", false, false, false),
},
MasterProfile: &MasterProfile{},
},

21
pkg/engine/templates_generated.go
Просмотреть файл

@ -12835,8 +12835,6 @@ spec:
port: 25227
targetPort: in-rs-tcp
---
# this is for versions >=1.19, for versions <1.19 we continue to use v1beta1
{{- if IsKubernetesVersionGe "1.19.0"}}
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
@ -12858,23 +12856,6 @@ spec:
names:
plural: healthstates
kind: HealthState
{{- else }}
apiVersion: {{GetCRDAPIVersion}}
kind: CustomResourceDefinition
metadata:
name: healthstates.azmon.container.insights
namespace: kube-system
labels:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
spec:
group: azmon.container.insights
version: v1
scope: Namespaced
names:
plural: healthstates
kind: HealthState
{{end}}
`)
func k8sAddonsContainerMonitoringYamlBytes() ([]byte, error) {
@ -14508,7 +14489,7 @@ spec:
- emptyDir: {}
name: tmp-dir
---
apiVersion: apiregistration.k8s.io/v1{{- if not (IsKubernetesVersionGe "1.19.0")}}beta1{{end}}
apiVersion: apiregistration.k8s.io/v1
kind: APIService
metadata:
labels:

104
pkg/engine/testdata/azurestack/kubernetes-ubuntu16.json поставляемый
Просмотреть файл

@ -1,104 +0,0 @@
{
"apiVersion": "vlabs",
"location": "local",
"properties": {
"orchestratorProfile": {
"kubernetesConfig": {
"kubernetesImageBase": "k8s.gcr.io/",
"useInstanceMetadata": false,
"useCloudControllerManager": true,
"networkPolicy": "none"
}
},
"customCloudProfile": {
"identitySystem": "azure_ad",
"authenticationMethod": "client_secret",
"portalURL": "https://portal.local.azurestack.external/",
"environment":{
"name": "AzureStackCloud",
"managementPortalURL": "https://portal.local.azurestack.external/",
"publishSettingsURL": "",
"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.azurestackci15.onmicrosoft.com/36f71706-54df-4305-9847-5b038a4cf189",
"graphEndpoint": "https://graph.windows.net/",
"storageEndpointSuffix": "local.azurestack.external",
"sqlDatabaseDNSSuffix": "",
"trafficManagerDNSSuffix": "",
"keyVaultDNSSuffix": "vault.local.azurestack.external",
"serviceBusEndpointSuffix": "",
"serviceManagementVMDNSSuffix": "cloudapp.net",
"resourceManagerVMDNSSuffix": "cloudapp.azurestack.external",
"containerRegistryDNSSuffix": ""
}
},
"masterProfile": {
"dnsPrefix": "k111007",
"distro": "aks-ubuntu-18.04",
"osDiskSizeGB": 200,
"count": 3,
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "linuxpool",
"osDiskSizeGB": 200,
"count": 3,
"vmSize": "Standard_D2_v2",
"distro": "aks-ubuntu-18.04",
"availabilityProfile": "AvailabilitySet",
"AcceleratedNetworkingEnabled": false
},
{
"name": "windowspool",
"osDiskSizeGB": 128,
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Windows",
"availabilityProfile": "AvailabilitySet",
"AcceleratedNetworkingEnabled": false
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "ssh-rsa publickey azure@linux"
}
]
}
},
"windowsProfile": {
"adminUsername": "azureuser",
"adminPassword": "myAdminPassword~1",
"sshEnabled": true
},
"servicePrincipalProfile": {
"clientId": "ServicePrincipalClientID",
"secret": "myServicePrincipalClientSecret"
},
"certificateProfile": {
"caCertificate": "caCertificate",
"caPrivateKey": "caPrivateKey",
"apiServerCertificate": "/subscriptions/my-sub/resourceGroups/my-rg/providers/Microsoft.KeyVault/vaults/my-kv/secrets/my-secret1/ver1",
"apiServerPrivateKey": "apiServerPrivateKey",
"clientCertificate": "clientCertificate",
"clientPrivateKey": "clientPrivateKey",
"kubeConfigCertificate": "kubeConfigCertificate",
"kubeConfigPrivateKey": "kubeConfigPrivateKey",
"etcdClientCertificate": "etcdClientCertificate",
"etcdClientPrivateKey": "etcdClientPrivateKey",
"etcdServerCertificate": "etcdServerCertificate",
"etcdServerPrivateKey": "etcdServerPrivateKey",
"etcdPeerCertificates": [
"etcdPeerCertificate0"
],
"etcdPeerPrivateKeys": [
"etcdPeerPrivateKey0"
]
}
}
}

2
vhd/packer/configure-windows-vhd.ps1
Просмотреть файл

@ -121,8 +121,6 @@ function Get-FilesToCacheOnVHD {
"https://kubernetesartifacts.azureedge.net/csi-proxy/v0.2.2/binaries/csi-proxy-v0.2.2.tar.gz"
);
"c:\akse-cache\win-k8s\" = @(
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.16/windowszip/v1.19.16-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.15/windowszip/v1.20.15-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.21.12/windowszip/v1.21.12-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.22.9/windowszip/v1.22.9-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.23.6/windowszip/v1.23.6-1int.zip",

4
vhd/packer/install-dependencies.sh
Просмотреть файл

@ -223,8 +223,6 @@ K8S_VERSIONS="
1.23.6
1.22.9
1.21.12
1.20.15
1.19.16
"
for KUBERNETES_VERSION in ${K8S_VERSIONS}; do
for component in kube-apiserver kube-controller-manager kube-proxy kube-scheduler; do
@ -242,8 +240,6 @@ CLOUD_MANAGER_VERSIONS="
1.23.11
1.1.14
1.0.18
0.7.21
0.6.0
"
for CLOUD_MANAGER_VERSION in ${CLOUD_MANAGER_VERSIONS}; do
for COMPONENT in azure-cloud-controller-manager azure-cloud-node-manager; do