Skip to content

Commit 25edd4e

Browse files
authored
Merge pull request #91 from canonical/fix/templates
Use default risk level and confinement on templates
2 parents 3dfd18a + a21eae3 commit 25edd4e

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

templates/cluster-template-aws.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ export AWS_NODE_MACHINE_FLAVOR=t3.large
1414
export AWS_SSH_KEY_NAME=my-ssh-key
1515

1616
# (optional) Snap risk level and confinement
17-
export SNAP_RISKLEVEL=""
18-
export SNAP_CONFINEMENT=""
17+
export SNAP_RISKLEVEL="stable"
18+
export SNAP_CONFINEMENT="classic"
1919

2020
# Upgrade configuration
2121
export UPGRADE_STRATEGY=SmartUpgrade

templates/cluster-template-azure.rc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export AZURE_CLIENT_SECRET="<Password>"
1010
export AZURE_LOCATION=eastus # this should be an Azure region that your subscription has quota for.
1111
export AZURE_SUBSCRIPTION_ID="<SubscriptionId>"
1212

13-
# Azure virtual machine types
13+
# Azure virtual machine types
1414
export AZURE_CONTROL_PLANE_MACHINE_TYPE=Standard_D2a_v4
1515
export AZURE_NODE_MACHINE_TYPE=Standard_D2a_v4
1616

@@ -27,9 +27,8 @@ export CLUSTER_IDENTITY_NAME="cluster-identity"
2727
export AZURE_CLUSTER_IDENTITY_SECRET_NAMESPACE="default"
2828

2929
# (optional) Snap risk level and confinement
30-
export SNAP_RISKLEVEL=""
31-
export SNAP_CONFINEMENT=""
32-
30+
export SNAP_RISKLEVEL="stable"
31+
export SNAP_CONFINEMENT="classic"
3332

3433
# Upgrade configuration
3534
export UPGRADE_STRATEGY=SmartUpgrade

templates/cluster-template-gcp.rc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ export GCP_NODE_MACHINE_TYPE=n1-standard-2
1515
export IMAGE_ID=projects/$GCP_PROJECT/global/images/ubuntu-2204
1616

1717
# (optional) Snap risk level and confinement
18-
export SNAP_RISKLEVEL=""
19-
export SNAP_CONFINEMENT=""
20-
18+
export SNAP_RISKLEVEL="stable"
19+
export SNAP_CONFINEMENT="classic"
2120

2221
# Upgrade configuration
2322
export UPGRADE_STRATEGY=SmartUpgrade

templates/cluster-template-openstack.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ export CONTAINERD_HTTPS_PROXY=""
3232
export CONTAINERD_NO_PROXY=""
3333

3434
# (optional) Snap risk level and confinement
35-
export SNAP_RISKLEVEL=""
36-
export SNAP_CONFINEMENT=""
35+
export SNAP_RISKLEVEL="stable"
36+
export SNAP_CONFINEMENT="classic"
3737

3838
# Upgrade configuration
3939
export UPGRADE_STRATEGY=SmartUpgrade

0 commit comments

Comments
 (0)