Skip to content

Commit 5f60362

Browse files
rwaffenrwaffen
authored
Merge pull request #116 from ananace/version-resync
Resync bundled resources to modern versions
2 parents f806f66 + a94e797 commit 5f60362

File tree

11 files changed

+293
-337
lines changed

11 files changed

+293
-337
lines changed

‎REFERENCE.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ Data type: `String[1]`
256256

257257
version of etcd to install
258258

259-
Default value: `'3.5.16'`
259+
Default value: `'3.5.18'`
260260

261261
##### <a name="-k8s--firewall_type"></a>`firewall_type`
262262

@@ -496,7 +496,7 @@ Data type: `String[1]`
496496

497497
version of kubernetes to install
498498

499-
Default value: `'1.28.14'`
499+
Default value: `'1.31.6'`
500500

501501
### <a name="k8s--install--cni_plugins"></a>`k8s::install::cni_plugins`
502502

@@ -534,7 +534,7 @@ Data type: `String[1]`
534534

535535
The version of CNI plugins to install - if applicable
536536

537-
Default value: `'v1.2.0'`
537+
Default value: `'v1.6.2'`
538538

539539
##### <a name="-k8s--install--cni_plugins--download_url_template"></a>`download_url_template`
540540

‎manifests/init.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
K8s::Ensure $ensure = 'present',
5151
Enum['container', 'native'] $packaging = 'native',
5252
K8s::Native_packaging $native_packaging = 'loose',
53-
String[1] $version = '1.28.14',
54-
String[1] $etcd_version = '3.5.16',
53+
String[1] $version = '1.31.6',
54+
String[1] $etcd_version = '3.5.18',
5555

5656
String[1] $container_registry = 'registry.k8s.io',
5757
Optional[String[1]] $container_image_tag = undef,

‎manifests/install/cni_plugins.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
class k8s::install::cni_plugins (
1010
K8s::Ensure $ensure = $k8s::ensure,
11-
String[1] $version = 'v1.2.0',
11+
String[1] $version = 'v1.6.2',
1212
String[1] $method = $k8s::native_packaging,
1313
String[1] $download_url_template = 'https://github.com/containernetworking/plugins/releases/download/%{version}/cni-plugins-linux-%{arch}-%{version}.tgz',
1414
Optional[String[1]] $package_name = undef,

‎manifests/server/resources.pp

+12-7
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# @param flannel_image the image to use for the Flannel
1919
# @param flannel_registry the registry to use for the Flannel image
2020
# @param flannel_tag the tag to use for the Flannel image
21+
# @param flannel_netpol if flannel should act on network policies
2122
# @param image_pull_secrets the secrets to pull from private registries
2223
# @param kube_proxy_daemonset_config the configuration to use for the kube-proxy DaemonSet
2324
# @param kube_proxy_image the image to use for the kube-proxy
@@ -50,14 +51,18 @@
5051
Hash[String,Data] $extra_kube_proxy_args = {},
5152
String[1] $coredns_registry = 'docker.io',
5253
String[1] $coredns_image = 'coredns/coredns',
53-
String[1] $coredns_tag = '1.8.7',
54+
String[1] $coredns_tag = '1.12.0',
5455
Hash[String,Data] $coredns_deployment_config = {},
55-
String[1] $flannel_cni_registry = 'docker.io',
56-
String[1] $flannel_cni_image = 'rancher/mirrored-flannelcni-flannel-cni-plugin',
57-
String[1] $flannel_cni_tag = 'v1.0.0',
58-
String[1] $flannel_registry = 'docker.io',
59-
String[1] $flannel_image = 'rancher/mirrored-flannelcni-flannel',
60-
String[1] $flannel_tag = 'v0.16.1',
56+
String[1] $flannel_cni_registry = 'ghcr.io',
57+
String[1] $flannel_cni_image = 'flannel-io/flannel-cni-plugin',
58+
String[1] $flannel_cni_tag = 'v1.6.2-flannel1',
59+
String[1] $flannel_netpol_registry = 'registry.k8s.io',
60+
String[1] $flannel_netpol_image = 'networking/kube-network-policies',
61+
String[1] $flannel_netpol_tag = 'v0.7.0',
62+
String[1] $flannel_registry = 'ghcr.io',
63+
String[1] $flannel_image = 'flannel-io/flannel',
64+
String[1] $flannel_tag = 'v0.26.4',
65+
Boolean $flannel_netpol = false,
6166
Hash[String,Data] $flannel_daemonset_config = {},
6267
Optional[Array] $image_pull_secrets = undef,
6368
) {

‎manifests/server/resources/coredns.pp

+25-23
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,9 @@
144144
content => {
145145
metadata => {
146146
labels => {
147-
'k8s-app' => 'coredns',
147+
'k8s-app' => 'kube-dns',
148148
'kubernetes.io/name' => 'CoreDNS',
149+
'app.kubernetes.io/name' => 'coredns',
149150
'kubernetes.io/managed-by' => 'puppet',
150151
},
151152
},
@@ -158,35 +159,33 @@
158159
},
159160
selector => {
160161
matchLabels => {
161-
'k8s-app' => 'coredns',
162-
'kubernetes.io/managed-by' => 'puppet',
162+
'k8s-app' => 'kube-dns',
163+
'app.kubernetes.io/name' => 'coredns',
163164
},
164165
},
165166
template => {
166167
metadata => {
167168
labels => {
168-
'k8s-app' => 'coredns',
169+
'k8s-app' => 'kube-dns',
170+
'app.kubernetes.io/name' => 'coredns',
169171
'kubernetes.io/managed-by' => 'puppet',
170172
},
171173
},
172174
spec => {
173175
affinity => {
174176
podAntiAffinity => {
175-
preferredDuringSchedulingIgnoredDuringExecution => [
177+
requiredDuringSchedulingIgnoredDuringExecution => [
176178
{
177-
weight => 100,
178-
podAffinityTerm => {
179-
labelSelector => {
180-
matchExpressions => [
181-
{
182-
key => 'k8s-app',
183-
operator => 'In',
184-
values => ['coredns'],
185-
},
186-
],
187-
},
188-
topologyKey => 'kubernetes.io/hostname',
179+
labelSelector => {
180+
matchExpressions => [
181+
{
182+
key => 'k8s-app',
183+
operator => 'In',
184+
values => ['kube-dns'],
185+
},
186+
],
189187
},
188+
topologyKey => 'kubernetes.io/hostname',
190189
},
191190
],
192191
},
@@ -198,10 +197,6 @@
198197
key => 'CriticalAddonsOnly',
199198
operator => 'Exists',
200199
},
201-
{
202-
key => 'node-role.kubernetes.io/control-plane',
203-
effect => 'NoSchedule',
204-
},
205200
],
206201
nodeSelector => {
207202
'kubernetes.io/os' => 'linux',
@@ -311,15 +306,17 @@
311306
'prometheus.io/scrape' => 'true',
312307
},
313308
labels => {
314-
'k8s-app' => 'coredns',
309+
'k8s-app' => 'kube-dns',
315310
'kubernetes.io/cluster-service' => 'true',
316311
'kubernetes.io/name' => 'CoreDNS',
312+
'app.kubernetes.io/name' => 'coredns',
317313
'kubernetes.io/managed-by' => 'puppet',
318314
},
319315
},
320316
spec => $_addn_coredns_svc_hash + {
321317
selector => {
322-
'k8s-app' => 'coredns',
318+
'k8s-app' => 'kube-dns',
319+
'app.kubernetes.io/name' => 'coredns',
323320
},
324321
ports => [
325322
{
@@ -332,6 +329,11 @@
332329
port => 53,
333330
protocol => 'TCP',
334331
},
332+
{
333+
name => 'metrics',
334+
port => 9153,
335+
protocol => 'TCP',
336+
},
335337
],
336338
},
337339
};

0 commit comments

Comments
 (0)