Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Versions bump #1973

Merged
merged 15 commits into from
Jun 28, 2023
Merged

Versions bump #1973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9a5c4e5
versions bump
likamrat Jun 28, 2023
86aa1f7
1.27.1
likamrat Jun 28, 2023
0ed327f
condition logic
likamrat Jun 28, 2023
2d7b5fa
jq
likamrat Jun 28, 2023
711c67f
csi 1.26.5
likamrat Jun 28, 2023
31af20d
capz 1.7.6
likamrat Jun 28, 2023
7de26fe
capz 1.9.3 + csi 1.2.8 + calico + defender
likamrat Jun 28, 2023
d163746
capz 1.7.6
likamrat Jun 28, 2023
5ba1819
k8s 1.26.6 + ubuntu 22.04
likamrat Jun 28, 2023
8ae51bd
typo
likamrat Jun 28, 2023
665cc26
kubectl 1.26
likamrat Jun 28, 2023
9be0d4f
reveret to 1.25.11
likamrat Jun 28, 2023
87a4b89
1.27.1
likamrat Jun 28, 2023
cf48b8d
syntax
likamrat Jun 28, 2023
fa40c58
cross repo version updates
likamrat Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/installCAPI.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ sudo snap install kustomize

# Set CAPI deployment environment variables
export KUBECTL_VERSION="1.27/stable" # Do not change!
export CLUSTERCTL_VERSION="1.4.2" # Do not change!
export CLUSTERCTL_VERSION="1.4.4" # Do not change!
export CAPI_PROVIDER="azure" # Do not change!
export CAPI_PROVIDER_VERSION="1.7.6" # Do not change!
export KUBERNETES_VERSION="1.27.1" # Do not change!
export AZURE_DISK_CSI_DRIVER_VERSION="1.26.3" # Do not change!
export AZURE_DISK_CSI_DRIVER_VERSION="1.28.0" # Do not change!
export K3S_VERSION="1.27.1+k3s1" # Do not change!
export AZURE_ENVIRONMENT="AzurePublicCloud" # Do not change!
export CONTROL_PLANE_MACHINE_COUNT="3" # Do not change!
Expand Down
8 changes: 4 additions & 4 deletions azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/ubuntuCapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
},
"ubuntuOSVersion": {
"type": "String",
"defaultValue": "20_04-lts-gen2",
"defaultValue": "22_04-lts-gen2",
"allowedValues": [
"20_04-lts-gen2"
"22_04-lts-gen2"
],
"metadata": {
"description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version"
Expand Down Expand Up @@ -299,8 +299,8 @@
}
},
"imageReference": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-focal",
"publisher": "canonical",
"offer": "0001-com-ubuntu-server-jammy",
"sku": "[parameters('ubuntuOSVersion')]",
"version": "latest"
}
Expand Down
4 changes: 2 additions & 2 deletions azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/installCAPI.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ sudo snap install kustomize

# Set CAPI deployment environment variables
export KUBECTL_VERSION="1.27/stable" # Do not change!
export CLUSTERCTL_VERSION="1.4.2" # Do not change!
export CLUSTERCTL_VERSION="1.4.4" # Do not change!
export CAPI_PROVIDER="azure" # Do not change!
export CAPI_PROVIDER_VERSION="1.7.6" # Do not change!
export KUBERNETES_VERSION="1.27.1" # Do not change!
export AZURE_DISK_CSI_DRIVER_VERSION="1.26.3" # Do not change!
export AZURE_DISK_CSI_DRIVER_VERSION="1.28.0" # Do not change!
export K3S_VERSION="1.27.1+k3s1" # Do not change!
export AZURE_ENVIRONMENT="AzurePublicCloud" # Do not change!
export CONTROL_PLANE_MACHINE_COUNT="3" # Do not change!
Expand Down
8 changes: 4 additions & 4 deletions azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/ubuntuCapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
},
"ubuntuOSVersion": {
"type": "string",
"defaultValue": "20_04-lts-gen2",
"defaultValue": "22_04-lts-gen2",
"allowedValues": [
"20_04-lts-gen2"
"22_04-lts-gen2"
],
"metadata": {
"description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version"
Expand Down Expand Up @@ -268,8 +268,8 @@
}
},
"imageReference": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-focal",
"publisher": "canonical",
"offer": "0001-com-ubuntu-server-jammy",
"sku": "[parameters('ubuntuOSVersion')]",
"version": "latest"
}
Expand Down
12 changes: 6 additions & 6 deletions azure_arc_data_jumpstart/kubeadm/azure/ARM/ubuntuKubeadm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
},
"ubuntuOSVersion": {
"type": "string",
"defaultValue": "20_04-lts-gen2",
"defaultValue": "22_04-lts-gen2",
"allowedValues": [
"20_04-lts-gen2"
"22_04-lts-gen2"
],
"metadata": {
"description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version"
Expand Down Expand Up @@ -244,8 +244,8 @@
}
},
"imageReference": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-focal",
"publisher": "canonical",
"offer": "0001-com-ubuntu-server-jammy",
"sku": "[parameters('ubuntuOSVersion')]",
"version": "latest"
}
Expand Down Expand Up @@ -364,8 +364,8 @@
}
},
"imageReference": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-focal",
"publisher": "canonical",
"offer": "0001-com-ubuntu-server-jammy",
"sku": "[parameters('ubuntuOSVersion')]",
"version": "latest"
}
Expand Down
8 changes: 4 additions & 4 deletions azure_arc_data_jumpstart/microk8s/azure/arm_template/ubuntuMicrok8s.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
},
"ubuntuOSVersion": {
"type": "string",
"defaultValue": "20_04-lts-gen2",
"defaultValue": "22_04-lts-gen2",
"allowedValues": [
"20_04-lts-gen2"
"22_04-lts-gen2"
],
"metadata": {
"description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version"
Expand Down Expand Up @@ -221,8 +221,8 @@
}
},
"imageReference": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-focal",
"publisher": "canonical",
"offer": "0001-com-ubuntu-server-jammy",
"sku": "[parameters('ubuntuOSVersion')]",
"version": "latest"
}
Expand Down
2 changes: 1 addition & 1 deletion azure_arc_k8s_jumpstart/aks_iot_edge/terraform/variable.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ variable "sta-disk-vm" {

variable "image-publisher-vm" {
description = "(Required) Image Publisher SO of Virtual Machine"
default="Canonical"
default="canonical"
}

variable "image-offer-vm" {
Expand Down
2 changes: 1 addition & 1 deletion azure_arc_k8s_jumpstart/cluster_api/capi_azure/artifacts/installCAPI.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ echo ""

# Set deployment environment variables
export GUID=$(echo $RANDOM | md5sum | head -c 4; echo;) # Do not change!
export CLUSTERCTL_VERSION="1.4.2" # Do not change!
export CLUSTERCTL_VERSION="1.4.4" # Do not change!
export CAPI_PROVIDER="azure" # Do not change!
export CAPI_PROVIDER_VERSION="1.7.6" # Do not change!
export KUBERNETES_VERSION="1.27.1" # Do not change!
Expand Down
2 changes: 1 addition & 1 deletion azure_arc_k8s_jumpstart/cluster_api/capi_azure/installCAPI.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ echo ""

# Set deployment environment variables
export GUID=$(echo $RANDOM | md5sum | head -c 4; echo;) # Do not change!
export CLUSTERCTL_VERSION="1.4.2" # Do not change!
export CLUSTERCTL_VERSION="1.4.4" # Do not change!
export CAPI_PROVIDER="azure" # Do not change!
export CAPI_PROVIDER_VERSION="1.7.6" # Do not change!
export KUBERNETES_VERSION="1.27.1" # Do not change!
Expand Down
8 changes: 4 additions & 4 deletions azure_arc_k8s_jumpstart/rancher_k3s/azure/arm_template/azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
},
"ubuntuOSVersion": {
"type": "string",
"defaultValue": "20_04-lts-gen2",
"defaultValue": "22_04-lts-gen2",
"allowedValues": [
"20_04-lts-gen2"
"22_04-lts-gen2"
],
"metadata": {
"description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version"
Expand Down Expand Up @@ -242,8 +242,8 @@
}
},
"imageReference": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-focal",
"publisher": "canonical",
"offer": "0001-com-ubuntu-server-jammy",
"sku": "[parameters('ubuntuOSVersion')]",
"version": "latest"
}
Expand Down
4 changes: 2 additions & 2 deletions azure_arc_k8s_jumpstart/rancher_k3s/azure/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ resource "azurerm_linux_virtual_machine" "arck3sdemo" {
}

source_image_reference {
publisher = "Canonical"
offer = "0001-com-ubuntu-server-focal"
publisher = "canonical"
offer = "0001-com-ubuntu-server-jammy"
sku = var.ubuntuOSVersion
version = "latest"
}
Expand Down
2 changes: 1 addition & 1 deletion azure_arc_k8s_jumpstart/rancher_k3s/azure/terraform/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ variable "tenant_id" {
variable "ubuntuOSVersion" {
type = string
description = "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version."
default = "20_04-lts-gen2"
default = "22_04-lts-gen2"
}

variable "location" {
Expand Down
2 changes: 1 addition & 1 deletion azure_arc_servers_jumpstart/aws/scaled_deployment/ansible/terraform/aws_infra.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ data "aws_ami" "ubuntu" {
name = "virtualization-type"
values = ["hvm"]
}
owners = ["099720109477"] # Canonical
owners = ["099720109477"] # canonical
}

data "aws_ami" "Windows_2019" {
Expand Down
2 changes: 1 addition & 1 deletion azure_arc_servers_jumpstart/aws/ubuntu/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ data "aws_ami" "ubuntu" {
name = "virtualization-type"
values = ["hvm"]
}
owners = ["099720109477"] # Canonical
owners = ["099720109477"] # canonical
}

resource "aws_key_pair" "keypair" {
Expand Down
2 changes: 1 addition & 1 deletion azure_arc_servers_jumpstart/azure/linux/arm_template/azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@
}
},
"imageReference": {
"publisher": "Canonical",
"publisher": "canonical",
"offer": "UbuntuServer",
"sku": "[parameters('ubuntuOSVersion')]",
"version": "latest"
Expand Down
12 changes: 6 additions & 6 deletions azure_arc_servers_jumpstart/proxy/ARM/cloudDeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,9 @@
}
},
"imageReference": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-focal",
"sku": "20_04-lts-gen2",
"publisher": "canonical",
"offer": "0001-com-ubuntu-server-jammy",
"sku": "22_04-lts-gen2",
"version": "latest"
}
},
Expand Down Expand Up @@ -427,9 +427,9 @@
}
},
"imageReference": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-focal",
"sku": "20_04-lts-gen2",
"publisher": "canonical",
"offer": "0001-com-ubuntu-server-jammy",
"sku": "22_04-lts-gen2",
"version": "latest"
}
},
Expand Down
2 changes: 1 addition & 1 deletion azure_arc_servers_jumpstart/proxy/azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"ubuntuOSVersion": {
"type": "string",
"defaultValue": "20_04-lts-gen2",
"defaultValue": "22_04-lts-gen2",
"metadata": {
"description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version."
}
Expand Down
8 changes: 4 additions & 4 deletions azure_jumpstart_arcbox/ARM/kubernetes/ubuntuCapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
},
"ubuntuOSVersion": {
"type": "String",
"defaultValue": "20_04-lts-gen2",
"defaultValue": "22_04-lts-gen2",
"allowedValues": [
"20_04-lts-gen2"
"22_04-lts-gen2"
],
"metadata": {
"description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version"
Expand Down Expand Up @@ -216,8 +216,8 @@
}
},
"imageReference": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-focal",
"publisher": "canonical",
"offer": "0001-com-ubuntu-server-jammy",
"sku": "[parameters('ubuntuOSVersion')]",
"version": "latest"
}
Expand Down
8 changes: 4 additions & 4 deletions azure_jumpstart_arcbox/ARM/kubernetes/ubuntuRancher.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
},
"ubuntuOSVersion": {
"type": "String",
"defaultValue": "20_04-lts-gen2",
"defaultValue": "22_04-lts-gen2",
"allowedValues": [
"20_04-lts-gen2"
"22_04-lts-gen2"
],
"metadata": {
"description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version"
Expand Down Expand Up @@ -197,8 +197,8 @@
}
},
"imageReference": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-focal",
"publisher": "canonical",
"offer": "0001-com-ubuntu-server-jammy",
"sku": "[parameters('ubuntuOSVersion')]",
"version": "latest"
}
Expand Down
4 changes: 2 additions & 2 deletions azure_jumpstart_arcbox/artifacts/ArcServersLogonScript.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ if ($Env:flavor -ne "DevOps") {
Write-Output "Transferring installation script to nested Windows VMs..."
Copy-VMFile $SQLvmName -SourcePath "$agentScript\installArcAgentSQLSP.ps1" -DestinationPath "$Env:ArcBoxDir\installArcAgentSQL.ps1" -CreateFullPath -FileSource Host -Force

Write-Header "Onboarding Arc-enabled Servers"
Write-Header "Onboarding Arc-enabled servers"

# Onboarding the nested VMs as Azure Arc-enabled servers
Write-Output "Onboarding the nested Windows VMs as Azure Arc-enabled servers"
Expand Down Expand Up @@ -436,7 +436,7 @@ if ($Env:flavor -ne "DevOps") {
Set-SCPItem -ComputerName $Ubuntu01VmIp -Credential $linCreds -Destination "/home/$nestedLinuxUsername" -Path "$agentScript\installArcAgentModifiedUbuntu.sh" -Force
Set-SCPItem -ComputerName $Ubuntu02VmIp -Credential $linCreds -Destination "/home/$nestedLinuxUsername" -Path "$agentScript\installArcAgentModifiedUbuntu.sh" -Force

Write-Header "Onboarding Arc-enabled Servers"
Write-Header "Onboarding Arc-enabled servers"

# Onboarding the nested VMs as Azure Arc-enabled servers
Write-Output "Onboarding the nested Windows VMs as Azure Arc-enabled servers"
Expand Down
Loading