Bump Kubernetes version to 1.28.5

Signed-off-by: Jan Egil Ring <[email protected]>
likamrat · Mar 13, 2024 · 90ef602 · 90ef602
1 parent b022224
commit 90ef602
Show file tree

Hide file tree

Showing 22 changed files with 54 additions and 54 deletions.
diff --git a/azure_arc_app_services_jumpstart/aks/ARM/artifacts/Bootstrap.ps1 b/azure_arc_app_services_jumpstart/aks/ARM/artifacts/Bootstrap.ps1
@@ -76,10 +76,10 @@ Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/ma
 # Downloading GitHub artifacts for AppServicesLogonScript.ps1
 if ($deployAppService -eq $true -Or $deployFunction -eq $true -Or $deployApiMgmt -eq $true -Or $deployLogicApp -eq $true) {
 Invoke-WebRequest ($templateBaseUrl + "artifacts/AppServicesLogonScript.ps1") -OutFile "C:\Temp\AppServicesLogonScript.ps1"
-Invoke-WebRequest ($templateBaseUrl + "artifacts/deployAppService.ps1") -OutFile "C:\Temp\deployAppService.ps1"  
-Invoke-WebRequest ($templateBaseUrl + "artifacts/deployFunction.ps1") -OutFile "C:\Temp\deployFunction.ps1" 
-Invoke-WebRequest ($templateBaseUrl + "artifacts/deployApiMgmt.ps1") -OutFile "C:\Temp\deployApiMgmt.ps1" 
-Invoke-WebRequest ($templateBaseUrl + "artifacts/deployLogicApp.ps1") -OutFile "C:\Temp\deployLogicApp.ps1" 
+Invoke-WebRequest ($templateBaseUrl + "artifacts/deployAppService.ps1") -OutFile "C:\Temp\deployAppService.ps1"
+Invoke-WebRequest ($templateBaseUrl + "artifacts/deployFunction.ps1") -OutFile "C:\Temp\deployFunction.ps1"
+Invoke-WebRequest ($templateBaseUrl + "artifacts/deployApiMgmt.ps1") -OutFile "C:\Temp\deployApiMgmt.ps1"
+Invoke-WebRequest ($templateBaseUrl + "artifacts/deployLogicApp.ps1") -OutFile "C:\Temp\deployLogicApp.ps1"
 }
 
 # Downloading GitHub artifacts for ContainerAppsLogonScript.ps1
@@ -91,9 +91,9 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/ContainerAppsLogonScript.ps1")
 workflow ClientTools_01
         {
             $chocolateyAppList = 'azure-cli,az.powershell,kubernetes-cli,vcredist140,microsoft-edge,azcopy10,vscode,putty.install,kubernetes-helm,azurefunctions-vscode,dotnetcore-sdk,dotnet-sdk,dotnet-runtime,vscode-csharp,microsoftazurestorageexplorer,7zip'
-            $kubectlVersion = '1.26.6'
+            $kubectlVersion = '1.28.5'
             #Run commands in parallel.
-            Parallel 
+            Parallel
                 {
                     InlineScript {
                         param (
@@ -108,11 +108,11 @@ workflow ClientTools_01
                                 iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
                             }
                         }
-                        if ([string]::IsNullOrWhiteSpace($using:chocolateyAppList) -eq $false){   
-                            Write-Host "Chocolatey Apps Specified"  
-                            
+                        if ([string]::IsNullOrWhiteSpace($using:chocolateyAppList) -eq $false){
+                            Write-Host "Chocolatey Apps Specified"
+
                             $appsToInstall = $using:chocolateyAppList -split "," | foreach { "$($_.Trim())" }
-                        
+
                             foreach ($app in $appsToInstall)
                             {
                                 if ($app -eq "kubernetes-cli"){
@@ -173,5 +173,5 @@ Get-ScheduledTask -TaskName ServerManager | Disable-ScheduledTask
 
 # Clean up Bootstrap.log
 Stop-Transcript
-$logSuppress = Get-Content C:\Temp\Bootstrap.log | Where-Object { $_ -notmatch "Host Application: powershell.exe" } 
+$logSuppress = Get-Content C:\Temp\Bootstrap.log | Where-Object { $_ -notmatch "Host Application: powershell.exe" }
 $logSuppress | Set-Content C:\Temp\Bootstrap.log -Force
diff --git a/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.json b/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.json
@@ -47,7 +47,7 @@
             }
         },
         "kubernetesVersion": {
-            "defaultValue": "1.26.6",
+            "defaultValue": "1.28.5",
             "type": "string",
             "metadata": {
                 "description": "The version of Kubernetes"

diff --git a/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/installCAPI.sh b/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/installCAPI.sh
@@ -87,7 +87,7 @@ export KUBECTL_VERSION="1.28/stable" # Do not change!
 export CLUSTERCTL_VERSION="1.5.2" # Do not change!
 export CAPI_PROVIDER="azure" # Do not change!
 export CAPI_PROVIDER_VERSION="1.7.6" # Do not change!
-export KUBERNETES_VERSION="1.28.2" # Do not change!
+export KUBERNETES_VERSION="1.28.5" # Do not change!
 export CALICO_VERSION="v3.25.2" # Do not change!
 export AZURE_DISK_CSI_DRIVER_VERSION="1.29.0" # Do not change!
 export K3S_VERSION="1.28.2+k3s1" # Do not change!
@@ -222,7 +222,7 @@ while true; do
   # Iterate over each node and check its status
   for node in $nodes; do
     ready=$(kubectl get nodes $node --kubeconfig=./$CLUSTER_NAME.kubeconfig -o json | jq -r '.status.conditions[] | select(.type=="Ready") | .status')
-    
+
     if [[ $ready != "True" ]]; then
       echo "Node $node is not ready."
       all_ready=false
@@ -255,7 +255,7 @@ sudo service sshd restart
 echo ""
 sudo -u $adminUsername kubectl apply -f ${templateBaseUrl}artifacts/capiStorageClass.yaml
 
-# Renaming CAPI cluster context name 
+# Renaming CAPI cluster context name
 echo ""
 sudo -u $adminUsername kubectl config rename-context "$CLUSTER_NAME-admin@$CLUSTER_NAME" "arcapp-capi"
 
@@ -272,7 +272,7 @@ sudo -u $adminUsername az k8s-extension create --name "azuremonitor-containers"
 
 # Enabling Azure Policy for Kubernetes on the cluster
 echo ""
-sudo -u $adminUsername az k8s-extension create --name "arc-azurepolicy" --cluster-name $capiArcAppClusterName --resource-group $AZURE_RESOURCE_GROUP --cluster-type connectedClusters --extension-type Microsoft.PolicyInsights 
+sudo -u $adminUsername az k8s-extension create --name "arc-azurepolicy" --cluster-name $capiArcAppClusterName --resource-group $AZURE_RESOURCE_GROUP --cluster-type connectedClusters --extension-type Microsoft.PolicyInsights
 
 # Deploying The Azure disk Container Storage Interface (CSI) Kubernetes driver
 echo ""

diff --git a/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json b/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json
@@ -47,7 +47,7 @@
       }
     },
     "kubernetesVersion": {
-      "defaultValue": "1.26.6",
+      "defaultValue": "1.28.5",
       "type": "string",
       "metadata": {
         "description": "The version of Kubernetes"
@@ -87,7 +87,7 @@
       "metadata": {
         "description": "SQL Managed Instance high-availability deployment"
       }
-    },    
+    },
     "deployPostgreSQL": {
       "type": "bool",
       "defaultValue": false,

diff --git a/azure_arc_data_jumpstart/aks/DR/ARM/azuredeploy.json b/azure_arc_data_jumpstart/aks/DR/ARM/azuredeploy.json
@@ -47,7 +47,7 @@
       }
     },
     "kubernetesVersion": {
-      "defaultValue": "1.26.6",
+      "defaultValue": "1.28.5",
       "type": "string",
       "metadata": {
         "description": "The version of Kubernetes"

diff --git a/azure_arc_data_jumpstart/aks/Migration/ARM/azuredeploy.json b/azure_arc_data_jumpstart/aks/Migration/ARM/azuredeploy.json
@@ -47,7 +47,7 @@
       }
     },
     "kubernetesVersion": {
-      "defaultValue": "1.26.6",
+      "defaultValue": "1.28.5",
       "type": "string",
       "metadata": {
         "description": "The version of Kubernetes"
@@ -80,7 +80,7 @@
       "metadata": {
         "description": "SQL Managed Instance high-availability deployment"
       }
-    },    
+    },
     "githubAccount": {
       "type": "string",
       "metadata": {

diff --git a/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/installCAPI.sh b/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/installCAPI.sh
@@ -69,10 +69,10 @@ export KUBECTL_VERSION="1.28/stable" # Do not change!
 export CLUSTERCTL_VERSION="1.5.2" # Do not change!
 export CAPI_PROVIDER="azure" # Do not change!
 export CAPI_PROVIDER_VERSION="1.7.6" # Do not change!
-export KUBERNETES_VERSION="1.28.2" # Do not change!
+export KUBERNETES_VERSION="1.28.5" # Do not change!
 export CALICO_VERSION="v3.25.2" # Do not change!
 export AZURE_DISK_CSI_DRIVER_VERSION="1.29.0" # Do not change!
-export K3S_VERSION="1.28.2+k3s1" # Do not change!
+export K3S_VERSION="1.28.5+k3s1" # Do not change!
 export AZURE_ENVIRONMENT="AzurePublicCloud" # Do not change!
 export CONTROL_PLANE_MACHINE_COUNT="3" # Do not change!
 export WORKER_MACHINE_COUNT="3"
@@ -204,7 +204,7 @@ while true; do
   # Iterate over each node and check its status
   for node in $nodes; do
     ready=$(kubectl get nodes $node --kubeconfig=./$CLUSTER_NAME.kubeconfig -o json | jq -r '.status.conditions[] | select(.type=="Ready") | .status')
-    
+
     if [[ $ready != "True" ]]; then
       echo "Node $node is not ready."
       all_ready=false
@@ -237,7 +237,7 @@ sudo service sshd restart
 echo ""
 sudo -u $adminUsername kubectl apply -f ${templateBaseUrl}artifacts/capiStorageClass.yaml
 
-# Renaming CAPI cluster context name 
+# Renaming CAPI cluster context name
 echo ""
 sudo -u $adminUsername kubectl config rename-context "$CLUSTER_NAME-admin@$CLUSTER_NAME" "arcdata-capi"
 

diff --git a/azure_arc_k8s_jumpstart/aks/arm_template/azuredeploy.json b/azure_arc_k8s_jumpstart/aks/arm_template/azuredeploy.json
@@ -78,7 +78,7 @@
             "metadata": {
                 "description": "boolean flag to turn on and off of RBAC"
             }
-        },        
+        },
         "osType": {
             "type": "string",
             "defaultValue": "Linux",
@@ -90,7 +90,7 @@
             }
         },
         "kubernetesVersion": {
-            "defaultValue": "1.27.1",
+            "defaultValue": "1.28.5",
             "type": "string",
             "metadata": {
                 "description": "The version of Kubernetes."
@@ -112,7 +112,7 @@
             "tags": "[parameters('resourceTags')]",
             "properties": {
                 "kubernetesVersion": "[parameters('kubernetesVersion')]",
-                "enableRBAC": "[parameters('enableRBAC')]",                
+                "enableRBAC": "[parameters('enableRBAC')]",
                 "dnsPrefix": "[parameters('dnsPrefix')]",
                 "agentPoolProfiles": [
                     {

diff --git a/azure_arc_k8s_jumpstart/aks/arm_template/azuredeploy.parameters.json b/azure_arc_k8s_jumpstart/aks/arm_template/azuredeploy.parameters.json
@@ -4,7 +4,7 @@
     "parameters": {
         "clusterName": {
             "value": "<AKS cluster name>"
-        },      
+        },
          "linuxAdminUsername": {
             "value": "<OS Username>"
         },
@@ -18,7 +18,7 @@
             "value": "<Your Azure service principal password>"
         },
         "kubernetesVersion": {
-            "value": "<Kubernetes Version, e.g. 1.27.1>"
+            "value": "<Kubernetes Version, e.g. 1.28.5>"
         }
     }
 }
diff --git a/azure_arc_k8s_jumpstart/cluster_api/capi_azure/artifacts/installCAPI.sh b/azure_arc_k8s_jumpstart/cluster_api/capi_azure/artifacts/installCAPI.sh
@@ -19,8 +19,8 @@ echo ""
   export CLUSTERCTL_VERSION="1.5.2" # Do not change!
   export CAPI_PROVIDER="azure" # Do not change!
   export CAPI_PROVIDER_VERSION="1.7.6" # Do not change!
-  export KUBERNETES_VERSION="1.28.2" # Do not change!
-  export K3S_VERSION="1.28.2+k3s1" # Do not change!
+  export KUBERNETES_VERSION="1.28.5" # Do not change!
+  export K3S_VERSION="1.28.5+k3s1" # Do not change!
   export AZURE_ENVIRONMENT="AzurePublicCloud" # Do not change!
   export CONTROL_PLANE_MACHINE_COUNT="<Control Plane node count>" # Control Plane node count. For example: 1
   export WORKER_MACHINE_COUNT="<Workers node count>" # Workers node count. For example: 2
@@ -73,7 +73,7 @@ echo ""
 
   # Installing snap
   echo ""
-  echo "Installing snap"  
+  echo "Installing snap"
   sudo apt install snapd
   echo ""
 

diff --git a/azure_arc_k8s_jumpstart/cluster_api/capi_azure/installCAPI.sh b/azure_arc_k8s_jumpstart/cluster_api/capi_azure/installCAPI.sh
@@ -20,9 +20,9 @@ echo ""
   export CLUSTERCTL_VERSION="1.5.2" # Do not change!
   export CAPI_PROVIDER="azure" # Do not change!
   export CAPI_PROVIDER_VERSION="1.7.6" # Do not change!
-  export KUBERNETES_VERSION="1.28.2" # Do not change!
+  export KUBERNETES_VERSION="1.28.5" # Do not change!
   export CALICO_VERSION="v3.25.2" # Do not change!
-  export K3S_VERSION="1.28.2+k3s1" # Do not change!
+  export K3S_VERSION="1.28.5+k3s1" # Do not change!
   export AZURE_ENVIRONMENT="AzurePublicCloud" # Do not change!
   export CONTROL_PLANE_MACHINE_COUNT="<Control Plane node count>" # Control Plane node count. For example: 1
   export WORKER_MACHINE_COUNT="<Workers node count>" # Workers node count. For example: 2
@@ -75,13 +75,13 @@ echo ""
 
   # Installing snap
   echo ""
-  echo "Installing snap"  
+  echo "Installing snap"
   sudo apt install snapd
   echo ""
 
   # Installing jq
   echo ""
-  echo "Installing jq" 
+  echo "Installing jq"
   sudo apt install jq -y
   echo ""
 
@@ -219,7 +219,7 @@ EOF
     # Iterate over each node and check its status
     for node in $nodes; do
       ready=$(kubectl get nodes $node --kubeconfig=./$CLUSTER_NAME.kubeconfig -o json | jq -r '.status.conditions[] | select(.type=="Ready") | .status')
-      
+
       if [[ $ready != "True" ]]; then
         echo "Node $node is not ready."
         all_ready=false

diff --git a/azure_arc_k8s_jumpstart/rancher_k3s/azure/arm_template/scripts/installK3s.sh b/azure_arc_k8s_jumpstart/rancher_k3s/azure/arm_template/scripts/installK3s.sh
@@ -25,10 +25,10 @@ sed -i '6s/^/export vmName=/' vars.sh
 sed -i '7s/^/export azureLocation=/' vars.sh
 sed -i '8s/^/export templateBaseUrl=/' vars.sh
 
-chmod +x vars.sh 
+chmod +x vars.sh
 . ./vars.sh
 
-export K3S_VERSION="1.28.2+k3s1" # Do not change!
+export K3S_VERSION="1.28.5+k3s1" # Do not change!
 
 # Creating login message of the day (motd)
 sudo curl -v -o /etc/profile.d/welcomeK3s.sh ${templateBaseUrl}scripts/welcomeK3s.sh

diff --git a/azure_arc_k8s_jumpstart/rancher_k3s/azure/terraform/scripts/installK3s.sh b/azure_arc_k8s_jumpstart/rancher_k3s/azure/terraform/scripts/installK3s.sh
@@ -25,10 +25,10 @@ sed -i '6s/^/export vmName=/' vars.sh
 sed -i '7s/^/export azureLocation=/' vars.sh
 sed -i '8s/^/export templateBaseUrl=/' vars.sh
 
-chmod +x vars.sh 
+chmod +x vars.sh
 . ./vars.sh
 
-export K3S_VERSION="1.28.2+k3s1" # Do not change!
+export K3S_VERSION="1.28.5+k3s1" # Do not change!
 
 # Creating login message of the day (motd)
 sudo curl -v -o /etc/profile.d/welcomeK3s.sh ${templateBaseUrl}scripts/welcomeK3s.sh

diff --git a/azure_arc_k8s_jumpstart/rancher_k3s/vmware/terraform/scripts/vars.sh b/azure_arc_k8s_jumpstart/rancher_k3s/vmware/terraform/scripts/vars.sh
@@ -14,4 +14,4 @@ export TF_VAR_vsphere_password='<vCenter Admin Password>'
 export TF_VAR_vsphere_server='<vCenter server FQDN/IP>'
 export TF_VAR_admin_user='<OS Admin Username>'
 export TF_VAR_admin_password='<OS Admin Password>'
-export K3S_VERSION="1.28.2+k3s1" # Do not change!
+export K3S_VERSION="1.28.5+k3s1" # Do not change!
diff --git a/azure_arc_ml_jumpstart/aks/arm_template/aks.json b/azure_arc_ml_jumpstart/aks/arm_template/aks.json
@@ -88,7 +88,7 @@
       }
     },
     "kubernetesVersion": {
-      "defaultValue": "1.19.11",
+      "defaultValue": "1.28.5",
       "type": "string",
       "metadata": {
         "description": "The version of Kubernetes."

diff --git a/azure_arc_ml_jumpstart/aks/arm_template/artifacts/azuredeploy.parameters.example.json b/azure_arc_ml_jumpstart/aks/arm_template/artifacts/azuredeploy.parameters.example.json
@@ -30,7 +30,7 @@
       "value": "https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_ml_jumpstart/aks/arm_template/"
     },
     "kubernetesVersion": {
-      "value": "1.19.11"
+      "value": "1.28.5"
     },
     "dnsPrefix": {
       "value": "arcml"

diff --git a/azure_arc_ml_jumpstart/aks/arm_template/azuredeploy.json b/azure_arc_ml_jumpstart/aks/arm_template/azuredeploy.json
@@ -53,7 +53,7 @@
       }
     },
     "kubernetesVersion": {
-      "defaultValue": "1.26.6",
+      "defaultValue": "1.28.5",
       "type": "string",
       "metadata": {
         "description": "The version of Kubernetes."

diff --git a/azure_arc_ml_jumpstart/aks/arm_template/azuredeploy.parameters.json b/azure_arc_ml_jumpstart/aks/arm_template/azuredeploy.parameters.json
@@ -30,7 +30,7 @@
       "value": "https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_ml_jumpstart/aks/arm_template/"
     },
     "kubernetesVersion": {
-      "value": "1.19.11"
+      "value": "1.28.5"
     },
     "dnsPrefix": {
       "value": "arcml"

diff --git a/azure_jumpstart_arcbox/ARM/kubernetes/aks.json b/azure_jumpstart_arcbox/ARM/kubernetes/aks.json
@@ -107,7 +107,7 @@
         "metadata": {
           "description": "The version of Kubernetes"
         },
-        "defaultValue" : "1.26.6"
+        "defaultValue" : "1.28.5"
       }
     },
     "variables": {

diff --git a/azure_jumpstart_arcbox/artifacts/installCAPI.sh b/azure_jumpstart_arcbox/artifacts/installCAPI.sh
@@ -81,10 +81,10 @@ export KUBECTL_VERSION="1.28/stable" # Do not change!
 export CLUSTERCTL_VERSION="1.5.2" # Do not change!
 export CAPI_PROVIDER="azure" # Do not change!
 export CAPI_PROVIDER_VERSION="1.7.6" # Do not change!
-export KUBERNETES_VERSION="1.28.2" # Do not change!
+export KUBERNETES_VERSION="1.28.5" # Do not change!
 export CALICO_VERSION="v3.25.2" # Do not change!
 export AZURE_DISK_CSI_DRIVER_VERSION="1.29.0" # Do not change!
-export K3S_VERSION="1.28.2+k3s1" # Do not change!
+export K3S_VERSION="1.28.5+k3s1" # Do not change!
 export AZURE_ENVIRONMENT="AzurePublicCloud" # Do not change!
 export CONTROL_PLANE_MACHINE_COUNT="3" # Do not change!
 export WORKER_MACHINE_COUNT="3"
@@ -221,7 +221,7 @@ while true; do
   # Iterate over each node and check its status
   for node in $nodes; do
     ready=$(kubectl get nodes $node --kubeconfig=./$CLUSTER_NAME.kubeconfig -o json | jq -r '.status.conditions[] | select(.type=="Ready") | .status')
-    
+
     if [[ $ready != "True" ]]; then
       echo "Node $node is not ready."
       all_ready=false
@@ -255,7 +255,7 @@ sudo service sshd restart
 echo ""
 sudo -u $adminUsername kubectl apply -f ${templateBaseUrl}artifacts/capiStorageClass.yaml
 
-# Renaming CAPI cluster context name 
+# Renaming CAPI cluster context name
 echo ""
 sudo -u $adminUsername kubectl config rename-context "$CLUSTER_NAME-admin@$CLUSTER_NAME" "arcbox-capi"
 

diff --git a/azure_jumpstart_arcbox/bicep/kubernetes/aks.bicep b/azure_jumpstart_arcbox/bicep/kubernetes/aks.bicep
@@ -50,7 +50,7 @@ param enableRBAC bool = true
 param osType string = 'Linux'
 
 @description('The version of Kubernetes')
-param kubernetesVersion string = '1.26.6'
+param kubernetesVersion string = '1.28.5'
 
 var serviceCidr_primary = '10.20.64.0/19'
 var dnsServiceIP_primary = '10.20.64.10'

diff --git a/azure_jumpstart_arcbox/terraform/modules/kubernetes/aks/main.tf b/azure_jumpstart_arcbox/terraform/modules/kubernetes/aks/main.tf
@@ -82,7 +82,7 @@ variable "os_type" {
 variable "Kubernetes_version" {
   type        = string
   description = "The version of Kubernetes"
-  default     = "1.26.6"
+  default     = "1.28.5"
 }
 
 locals {