Skip to content

Commit

Permalink
Update k0s version to 1.31.1+k0s.1
Browse files Browse the repository at this point in the history
Signed-off-by: Andrei Pavlov <[email protected]>
  • Loading branch information
Kshatrix committed Oct 18, 2024
1 parent c47254d commit a4c12b1
Show file tree
Hide file tree
Showing 28 changed files with 40 additions and 46 deletions.
2 changes: 1 addition & 1 deletion config/dev/aws-managedcluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
instanceType: t3.small
workersNumber: 1
installBeachHeadServices: false
template: aws-standalone-cp-0-0-1
template: aws-standalone-cp-0-0-2
services:
- template: kyverno-3-2-6
name: kyverno
Expand Down
2 changes: 1 addition & 1 deletion config/dev/azure-managedcluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: azure-dev
namespace: ${NAMESPACE}
spec:
template: azure-standalone-cp-0-0-1
template: azure-standalone-cp-0-0-2
credential: azure-cluster-identity-cred
config:
controlPlaneNumber: 1
Expand Down
2 changes: 1 addition & 1 deletion config/dev/eks-managedcluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ spec:
config:
region: us-east-2
workersNumber: 1
template: aws-eks-0-0-1
template: aws-eks-0-0-2
credential: "aws-cluster-identity-cred"
2 changes: 1 addition & 1 deletion config/dev/vsphere-managedcluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: vsphere-dev
namespace: ${NAMESPACE}
spec:
template: vsphere-standalone-cp-0-0-1
template: vsphere-standalone-cp-0-0-2
credential: vsphere-cluster-identity-cred
config:
controlPlaneNumber: 1
Expand Down
4 changes: 2 additions & 2 deletions templates/cluster/aws-hosted-cp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.1
version: 0.0.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.30.4+k0s.0"
appVersion: "v1.31.1+k0s.1"
annotations:
hmc.mirantis.com/infrastructure-providers: aws
hmc.mirantis.com/control-plane-providers: k0smotron
Expand Down
2 changes: 1 addition & 1 deletion templates/cluster/aws-hosted-cp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ k0smotron:

# K0s parameters
k0s:
version: v1.30.4+k0s.0
version: v1.31.1+k0s.1
4 changes: 2 additions & 2 deletions templates/cluster/aws-standalone-cp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.1
version: 0.0.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.30.4+k0s.0"
appVersion: "v1.31.1+k0s.1"
annotations:
hmc.mirantis.com/infrastructure-providers: aws
hmc.mirantis.com/control-plane-providers: k0s
Expand Down
2 changes: 1 addition & 1 deletion templates/cluster/aws-standalone-cp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ worker:

# K0s parameters
k0s:
version: v1.30.4+k0s.0
version: v1.31.1+k0s.1
4 changes: 2 additions & 2 deletions templates/cluster/azure-hosted-cp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.1
version: 0.0.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.30.4+k0s.0"
appVersion: "v1.31.1+k0s.1"
annotations:
hmc.mirantis.com/infrastructure-providers: azure
hmc.mirantis.com/control-plane-providers: k0s
Expand Down
2 changes: 1 addition & 1 deletion templates/cluster/azure-hosted-cp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ k0smotron:

# K0s parameters
k0s:
version: v1.30.4+k0s.0
version: v1.31.1+k0s.1
4 changes: 2 additions & 2 deletions templates/cluster/azure-standalone-cp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.1
version: 0.0.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.30.4+k0s.0"
appVersion: "1.31.1+k0s.1"
annotations:
hmc.mirantis.com/infrastructure-providers: azure
hmc.mirantis.com/control-plane-providers: k0s
Expand Down
2 changes: 1 addition & 1 deletion templates/cluster/azure-standalone-cp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ worker:

# K0s parameters
k0s:
version: v1.30.4+k0s.0
version: v1.31.1+k0s.1
4 changes: 2 additions & 2 deletions templates/cluster/vsphere-hosted-cp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.1
version: 0.0.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.30.4+k0s.0"
appVersion: "v1.31.1+k0s.1"
annotations:
hmc.mirantis.com/type: deployment
hmc.mirantis.com/infrastructure-providers: vsphere
Expand Down
6 changes: 1 addition & 5 deletions templates/cluster/vsphere-hosted-cp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ memory: 4096
vmTemplate: ""
network: ""

# K0s parameters
k0s:
version: v1.30.4+k0s.0

# K0smotron parameters
k0smotron:
service:
Expand All @@ -47,4 +43,4 @@ k0smotron:

# K0s parameters
k0s:
version: v1.30.4+k0s.0
version: v1.31.1+k0s.1
4 changes: 2 additions & 2 deletions templates/cluster/vsphere-standalone-cp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.1
version: 0.0.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.30.4+k0s.0"
appVersion: "v1.31.1+k0s.1"
annotations:
hmc.mirantis.com/type: deployment
hmc.mirantis.com/infrastructure-providers: vsphere
Expand Down
2 changes: 1 addition & 1 deletion templates/cluster/vsphere-standalone-cp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ worker:

# K0s parameters
k0s:
version: v1.30.4+k0s.0
version: v1.31.1+k0s.1
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: hmc.mirantis.com/v1alpha1
kind: ClusterTemplate
metadata:
name: aws-hosted-cp-0-0-1
name: aws-hosted-cp-0-0-2
annotations:
helm.sh/resource-policy: keep
spec:
helm:
chartName: aws-hosted-cp
chartVersion: 0.0.1
chartVersion: 0.0.2
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: hmc.mirantis.com/v1alpha1
kind: ClusterTemplate
metadata:
name: aws-standalone-cp-0-0-1
name: aws-standalone-cp-0-0-2
annotations:
helm.sh/resource-policy: keep
spec:
helm:
chartName: aws-standalone-cp
chartVersion: 0.0.1
chartVersion: 0.0.2
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: hmc.mirantis.com/v1alpha1
kind: ClusterTemplate
metadata:
name: azure-hosted-cp-0-0-1
name: azure-hosted-cp-0-0-2
annotations:
helm.sh/resource-policy: keep
spec:
helm:
chartName: azure-hosted-cp
chartVersion: 0.0.1
chartVersion: 0.0.2
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: hmc.mirantis.com/v1alpha1
kind: ClusterTemplate
metadata:
name: azure-standalone-cp-0-0-1
name: azure-standalone-cp-0-0-2
annotations:
helm.sh/resource-policy: keep
spec:
helm:
chartName: azure-standalone-cp
chartVersion: 0.0.1
chartVersion: 0.0.2
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: hmc.mirantis.com/v1alpha1
kind: ClusterTemplate
metadata:
name: vsphere-hosted-cp-0-0-1
name: vsphere-hosted-cp-0-0-2
annotations:
helm.sh/resource-policy: keep
spec:
helm:
chartName: vsphere-hosted-cp
chartVersion: 0.0.1
chartVersion: 0.0.2
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: hmc.mirantis.com/v1alpha1
kind: ClusterTemplate
metadata:
name: vsphere-standalone-cp-0-0-1
name: vsphere-standalone-cp-0-0-2
annotations:
helm.sh/resource-policy: keep
spec:
helm:
chartName: vsphere-standalone-cp
chartVersion: 0.0.1
chartVersion: 0.0.2
2 changes: 1 addition & 1 deletion test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ManagedCluster
metadata:
name: ${MANAGED_CLUSTER_NAME}
spec:
template: aws-hosted-cp-0-0-1
template: aws-hosted-cp-0-0-2
credential: ${AWS_CLUSTER_IDENTITY}-cred
config:
clusterIdentity:
Expand Down
4 changes: 1 addition & 3 deletions test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ManagedCluster
metadata:
name: ${MANAGED_CLUSTER_NAME}
spec:
template: aws-standalone-cp-0-0-1
template: aws-standalone-cp-0-0-2
credential: ${AWS_CLUSTER_IDENTITY}-cred
config:
clusterIdentity:
Expand All @@ -17,5 +17,3 @@ spec:
instanceType: ${AWS_INSTANCE_TYPE:=t3.small}
worker:
instanceType: ${AWS_INSTANCE_TYPE:=t3.small}


2 changes: 1 addition & 1 deletion test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: ${MANAGED_CLUSTER_NAME}
namespace: ${NAMESPACE}
spec:
template: azure-hosted-cp-0-0-1
template: azure-hosted-cp-0-0-2
credential: ${AZURE_CLUSTER_IDENTITY}-cred
config:
location: "${AZURE_REGION}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: ${MANAGED_CLUSTER_NAME}
namespace: ${NAMESPACE}
spec:
template: azure-standalone-cp-0-0-1
template: azure-standalone-cp-0-0-2
credential: ${AZURE_CLUSTER_IDENTITY}-cred
config:
controlPlaneNumber: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ManagedCluster
metadata:
name: ${MANAGED_CLUSTER_NAME}
spec:
template: vsphere-hosted-cp-0-0-1
template: vsphere-hosted-cp-0-0-2
credential: ${VSPHERE_CLUSTER_IDENTITY}-cred
config:
controlPlaneNumber: ${CONTROL_PLANE_NUMBER:=1}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ManagedCluster
metadata:
name: ${MANAGED_CLUSTER_NAME}
spec:
template: vsphere-standalone-cp-0-0-1
template: vsphere-standalone-cp-0-0-2
credential: ${VSPHERE_CLUSTER_IDENTITY}-cred
config:
controlPlaneNumber: ${CONTROL_PLANE_NUMBER:=1}
Expand Down

0 comments on commit a4c12b1

Please sign in to comment.