airship/images
Code Issues Proposed changes

Merge "Upgrade Kubernetes to 1.21.2"

Browse Source
This commit is contained in:
Zuul 2021-09-24 19:07:12 +00:00 committed by Gerrit Code Review
commit 3a67e486dd
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bootstrap_capz/assets/help.txt
View File

@ -18,10 +18,10 @@ spec:
resourceGroup: <Azure Resource Group Name> resourceGroup: <Azure Resource Group Name>
region: <Azure Region, e.g., centralus> region: <Azure Region, e.g., centralus>
cluster: cluster:
k8sVersion: <Kubernetes version, e.g., 1.18.6> k8sVersion: <Kubernetes version, e.g., 1.21.2>
vmSize: <Azure Compute VM Type, e.g., Standard_B2s> vmSize: <Azure Compute VM Type, e.g., Standard_B2s>
replicas: <Node Replica Number for the cluster. Default is 1> replicas: <Node Replica Number for the cluster. Default is 1>
kubeconfig: <Kubernetes version, e.g., 1.18.2> kubeconfig: <Kubernetes version, e.g., 1.21.2>
</YAML> </YAML>
It also accepts the JSON file format. It also accepts the JSON file format.
@ -42,10 +42,10 @@ It also accepts the JSON file format.
"resourceGroup":"<Azure Resource Group Name>", "resourceGroup":"<Azure Resource Group Name>",
"region":"<Azure Region, e.g., centralus>", "region":"<Azure Region, e.g., centralus>",
"cluster":{ "cluster":{
"k8sVersion":"<Kubernetes version, e.g., 1.18.6>", "k8sVersion":"<Kubernetes version, e.g., 1.21.2>",
"vmSize":"<Azure Compute VM Type, e.g., Standard_B2s>", "vmSize":"<Azure Compute VM Type, e.g., Standard_B2s>",
"replicas":<Node Replica Number for the cluster>, "replicas":<Node Replica Number for the cluster>,
"kubeconfig":"<Kubernetes version, e.g., 1.18.2>" "kubeconfig":"<Kubernetes version, e.g., 1.21.2>"
} }
} }
} }

2
bootstrap_capz/azure-config.json
View File

@ -13,7 +13,7 @@
"resourceGroup":"airship2-zuul-rg", "resourceGroup":"airship2-zuul-rg",
"spec":{ "spec":{
"cluster":{ "cluster":{
"k8sVersion":"1.18.6", "k8sVersion":"1.21.2",
"kubeconfig":"capz.kubeconfig", "kubeconfig":"capz.kubeconfig",
"replicas":1, "replicas":1,
"vmSize":"Standard_B2s" "vmSize":"Standard_B2s"

2
bootstrap_capz/azure-config.yaml
View File

@ -22,7 +22,7 @@ spec:
resourceGroup: airship2-zuul-rg resourceGroup: airship2-zuul-rg
region: centralus region: centralus
cluster: cluster:
k8sVersion: 1.18.6 k8sVersion: 1.21.2
vmSize: Standard_B2s vmSize: Standard_B2s
replicas: 1 replicas: 1
kubeconfig: capz.kubeconfig kubeconfig: capz.kubeconfig

2
bootstrap_capz/config/aks_cluster.go
View File

@ -47,7 +47,7 @@ const (
defaultResourceGroup = "airship2-aks-rg" defaultResourceGroup = "airship2-aks-rg"
defaultClusterName = "capi-azure" defaultClusterName = "capi-azure"
defaultVMSize = "Standard_B2s" defaultVMSize = "Standard_B2s"
defaultK8SVersion = "1.18.6" defaultK8SVersion = "1.21.2"
defaultKubeconfig = "kubeconfig" defaultKubeconfig = "kubeconfig"
) )