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

Bump k3s and k0s to latest v1.23 #355

Merged
merged 2 commits into from
Feb 2, 2022
Merged

Bump k3s and k0s to latest v1.23 #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
326ea64
chore: bump k3s image version to pick a bug fix
matskiv Feb 2, 2022
598eae5
feat: add k0s v1.23
matskiv Feb 2, 2022
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
2 changes: 1 addition & 1 deletion charts/k0s/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ syncer:
# Virtual Cluster (k0s) configuration
vcluster:
# Image to use for the virtual cluster
image: k0sproject/k0s:v1.22.4-k0s.0
image: k0sproject/k0s:v1.23.3-k0s.0
command:
- k0s
baseArgs:
Expand Down
2 changes: 1 addition & 1 deletion charts/k3s/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ syncer:
# Virtual Cluster (k3s) configuration
vcluster:
# Image to use for the virtual cluster
image: rancher/k3s:v1.21.4-k3s1
image: rancher/k3s:v1.23.3-k3s1
command:
- /bin/k3s
baseArgs:
Expand Down
2 changes: 1 addition & 1 deletion devspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ vars:
- name: SYNCER_IMAGE
value: ghcr.io/loft-sh/loft-enterprise/dev-vcluster
- name: K3S_IMAGE
value: rancher/k3s:v1.23.1-k3s1
value: rancher/k3s:v1.23.3-k3s1
# Replace this with your clusters service CIDR, you can find it out via
# kubectl apply -f hack/wrong-cluster-ip-service.yaml
- name: SERVICE_CIDR
Expand Down
9 changes: 5 additions & 4 deletions pkg/helm/values/k0s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import (
)

var K0SVersionMap = map[string]string{
"1.22": "k0sproject/k0s:v1.22.4-k0s.0",
"1.23": "k0sproject/k0s:v1.23.3-k0s.0",
"1.22": "k0sproject/k0s:v1.22.6-k0s.0",
}

func getDefaultK0SReleaseValues(chartOptions *helm.ChartOptions, log log.Logger) (string, error) {
Expand All @@ -20,9 +21,9 @@ func getDefaultK0SReleaseValues(chartOptions *helm.ChartOptions, log log.Logger)

image, ok := K0SVersionMap[serverVersionString]
if !ok {
if serverMinorInt > 22 {
log.Infof("officially unsupported host server version %s, will fallback to virtual cluster version v1.22", serverVersionString)
image = K0SVersionMap["1.22"]
if serverMinorInt > 23 {
log.Infof("officially unsupported host server version %s, will fallback to virtual cluster version v1.23", serverVersionString)
image = K0SVersionMap["1.23"]
} else {
log.Infof("officially unsupported host server version %s, will fallback to virtual cluster version v1.22", serverVersionString)
image = K0SVersionMap["1.22"]
Expand Down
8 changes: 4 additions & 4 deletions pkg/helm/values/k3s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ var (
)

var K3SVersionMap = map[string]string{
"1.23": "rancher/k3s:v1.23.1-k3s1",
"1.22": "rancher/k3s:v1.22.5-k3s1",
"1.21": "rancher/k3s:v1.21.4-k3s1",
"1.20": "rancher/k3s:v1.20.11-k3s2",
"1.23": "rancher/k3s:v1.23.3-k3s1",
"1.22": "rancher/k3s:v1.22.6-k3s1",
"1.21": "rancher/k3s:v1.21.9-k3s1",
"1.20": "rancher/k3s:v1.20.15-k3s1",
"1.19": "rancher/k3s:v1.19.13-k3s1",
"1.18": "rancher/k3s:v1.18.20-k3s1",
"1.17": "rancher/k3s:v1.17.17-k3s1",
Expand Down