Skip to content

Commit 67cd810

Browse files
togashidmtogashidm
authored
version: bump cluster-templates k3s (#209)
1 parent 7681a15 commit 67cd810

File tree

5 files changed

+33
-15
lines changed

5 files changed

+33
-15
lines changed

‎default-cluster-templates/baseline-k3s.json‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "baseline-k3s",
3-
"version": "v0.0.9",
4-
"kubernetesVersion": "v1.32.9+k3s1",
3+
"version": "v0.0.10",
4+
"kubernetesVersion": "v1.33.5+k3s1",
55
"description": "Baseline Cluster Template for k3s",
66
"controlplaneprovidertype": "k3s",
77
"infraprovidertype": "intel",
@@ -38,6 +38,11 @@
3838
{
3939
"path": "/etc/rancher/k3s/config.yaml.d/etcd-arg.yaml",
4040
"content": "etcd-arg:\n- cipher-suites=[TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384]"
41+
},
42+
{
43+
"content": "PATH=\"/var/lib/rancher/k3s/bin:$PATH\"\nKUBECONFIG=\"/etc/rancher/k3s/k3s.yaml\"",
44+
"path": "/etc/environment.d/50-k3s.conf",
45+
"permissions": "0644"
4146
}
4247
],
4348
"agentConfig": {
@@ -55,7 +60,8 @@
5560
"mkdir -p /etc/systemd/system/k3s-server.service.d",
5661
"echo '[Service]\nEnvironmentFile=/etc/environment' > /etc/systemd/system/k3s-server.service.d/override.conf",
5762
"mkdir -p /var/lib/rancher/k3s/bin",
58-
"export INSTALL_K3S_BIN_DIR=/var/lib/rancher/k3s/bin"
63+
"export INSTALL_K3S_BIN_DIR=/var/lib/rancher/k3s/bin",
64+
"ln -sf /var/lib/rancher/k3s/bin/k3s /usr/local/bin/kubectl"
5965
],
6066
"postK3sCommands": [],
6167
"serverConfig": {
@@ -73,7 +79,7 @@
7379
"servicelb"
7480
]
7581
},
76-
"version": "v1.32.9+k3s1"
82+
"version": "v1.33.5+k3s1"
7783
}
7884
}
7985
}

‎default-cluster-templates/privileged-k3s.json‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "privileged-k3s",
3-
"version": "v0.0.9",
4-
"kubernetesVersion": "v1.32.9+k3s1",
3+
"version": "v0.0.10",
4+
"kubernetesVersion": "v1.33.5+k3s1",
55
"description": "Privileged Cluster Template for k3s",
66
"controlplaneprovidertype": "k3s",
77
"infraprovidertype": "intel",
@@ -38,6 +38,11 @@
3838
{
3939
"path": "/etc/rancher/k3s/config.yaml.d/etcd-arg.yaml",
4040
"content": "etcd-arg:\n- cipher-suites=[TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384]"
41+
},
42+
{
43+
"content": "PATH=\"/var/lib/rancher/k3s/bin:$PATH\"\nKUBECONFIG=\"/etc/rancher/k3s/k3s.yaml\"",
44+
"path": "/etc/environment.d/50-k3s.conf",
45+
"permissions": "0644"
4146
}
4247
],
4348
"agentConfig": {
@@ -55,7 +60,8 @@
5560
"mkdir -p /etc/systemd/system/k3s-server.service.d",
5661
"echo '[Service]\nEnvironmentFile=/etc/environment' > /etc/systemd/system/k3s-server.service.d/override.conf",
5762
"mkdir -p /var/lib/rancher/k3s/bin",
58-
"export INSTALL_K3S_BIN_DIR=/var/lib/rancher/k3s/bin"
63+
"export INSTALL_K3S_BIN_DIR=/var/lib/rancher/k3s/bin",
64+
"ln -sf /var/lib/rancher/k3s/bin/k3s /usr/local/bin/kubectl"
5965
],
6066
"postK3sCommands": [],
6167
"serverConfig": {
@@ -73,7 +79,7 @@
7379
"servicelb"
7480
]
7581
},
76-
"version": "v1.32.9+k3s1"
82+
"version": "v1.33.5+k3s1"
7783
}
7884
}
7985
}

‎default-cluster-templates/restricted-k3s.json‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "restricted-k3s",
3-
"version": "v0.0.9",
4-
"kubernetesVersion": "v1.32.9+k3s1",
3+
"version": "v0.0.10",
4+
"kubernetesVersion": "v1.33.5+k3s1",
55
"description": "Restricted Cluster Template for k3s",
66
"controlplaneprovidertype": "k3s",
77
"infraprovidertype": "intel",
@@ -38,6 +38,11 @@
3838
{
3939
"path": "/etc/rancher/k3s/config.yaml.d/etcd-arg.yaml",
4040
"content": "etcd-arg:\n- cipher-suites=[TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384]"
41+
},
42+
{
43+
"content": "PATH=\"/var/lib/rancher/k3s/bin:$PATH\"\nKUBECONFIG=\"/etc/rancher/k3s/k3s.yaml\"",
44+
"path": "/etc/environment.d/50-k3s.conf",
45+
"permissions": "0644"
4146
}
4247
],
4348
"agentConfig": {
@@ -55,7 +60,8 @@
5560
"mkdir -p /etc/systemd/system/k3s-server.service.d",
5661
"echo '[Service]\nEnvironmentFile=/etc/environment' > /etc/systemd/system/k3s-server.service.d/override.conf",
5762
"mkdir -p /var/lib/rancher/k3s/bin",
58-
"export INSTALL_K3S_BIN_DIR=/var/lib/rancher/k3s/bin"
63+
"export INSTALL_K3S_BIN_DIR=/var/lib/rancher/k3s/bin",
64+
"ln -sf /var/lib/rancher/k3s/bin/k3s /usr/local/bin/kubectl"
5965
],
6066
"postK3sCommands": [],
6167
"serverConfig": {
@@ -73,7 +79,7 @@
7379
"servicelb"
7480
]
7581
},
76-
"version": "v1.32.9+k3s1"
82+
"version": "v1.33.5+k3s1"
7783
}
7884
}
7985
}

‎deployment/charts/cluster-manager/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ clusterManager:
7777
disable-multi-tenancy: false
7878
disable-inventory: false
7979
disable-metrics: true
80-
default-template: "baseline-k3s-v0.0.9"
80+
default-template: "baseline-k3s-v0.0.10"
8181
# TTL in hours for JWT tokens in generated kubeconfig files
8282
# 0 = immediate expiration (disables kubeconfig)
8383
# Actual TTL can be limited by Keycloak's realm-level max token lifetime settings

‎test/service/service_suite_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,8 @@ var _ = Describe("Cluster create/delete flow", Ordered, func() {
343343
Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"201\",method=\"POST\",path=\"/v2/clusters\"}"))
344344
Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"201\",method=\"POST\",path=\"/v2/templates\"}"))
345345
Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"204\",method=\"DELETE\",path=\"/v2/clusters/test-cluster\"}"))
346-
Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"204\",method=\"DELETE\",path=\"/v2/templates/baseline-k3s/v0.0.9\"}"))
347-
Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"409\",method=\"DELETE\",path=\"/v2/templates/baseline-k3s/v0.0.9\"}"))
346+
Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"204\",method=\"DELETE\",path=\"/v2/templates/baseline-k3s/v0.0.10\"}"))
347+
Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"409\",method=\"DELETE\",path=\"/v2/templates/baseline-k3s/v0.0.10\"}"))
348348
Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_time_seconds_histogram_bucket{le=\"0.005\"}"))
349349
Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_time_seconds_histogram_bucket{le=\"0.01\"}"))
350350
Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_time_seconds_histogram_bucket{le=\"0.025\"}"))

0 commit comments

Comments
 (0)