chore: upgrade k8s cluster
This commit is contained in:
parent
f50528f81e
commit
72fab36d11
7 changed files with 37 additions and 28 deletions
|
@ -26,7 +26,7 @@ resource "hcloud_server" "machine" {
|
||||||
for_each = var.k3os_workers
|
for_each = var.k3os_workers
|
||||||
name = each.key
|
name = each.key
|
||||||
server_type = each.value.server_type
|
server_type = each.value.server_type
|
||||||
datacenter = "hel1-dc2"
|
location = each.value.location
|
||||||
image = "ubuntu-22.04"
|
image = "ubuntu-22.04"
|
||||||
|
|
||||||
backups = each.value.backups
|
backups = each.value.backups
|
||||||
|
|
|
@ -21,6 +21,7 @@ variable "k3os_workers" {
|
||||||
server_type = string
|
server_type = string
|
||||||
backups = bool
|
backups = bool
|
||||||
private_ip = string
|
private_ip = string
|
||||||
|
location = string
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ terraform {
|
||||||
}
|
}
|
||||||
ct = {
|
ct = {
|
||||||
source = "poseidon/ct"
|
source = "poseidon/ct"
|
||||||
version = "0.13.0"
|
version = "0.11.0"
|
||||||
}
|
}
|
||||||
template = {
|
template = {
|
||||||
source = "hashicorp/template"
|
source = "hashicorp/template"
|
||||||
|
|
|
@ -1,24 +1,18 @@
|
||||||
k3os_workers = {
|
k3os_workers = {
|
||||||
"worker1-gen3" = {
|
|
||||||
backups = false
|
|
||||||
node_type = "worker"
|
|
||||||
server_type = "cx31"
|
|
||||||
private_ip = "172.23.2.24"
|
|
||||||
}
|
|
||||||
|
|
||||||
"worker1-gen4" = {
|
"worker1-gen4" = {
|
||||||
backups = false
|
backups = false
|
||||||
node_type = "worker"
|
node_type = "worker"
|
||||||
server_type = "cx31"
|
server_type = "cx31"
|
||||||
private_ip = "172.23.2.20"
|
private_ip = "172.23.2.20"
|
||||||
|
location = "hel1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
"worker2-gen4" = {
|
||||||
"worker2-gen3" = {
|
|
||||||
backups = false
|
backups = false
|
||||||
node_type = "worker"
|
node_type = "worker"
|
||||||
server_type = "cx31"
|
server_type = "cax21"
|
||||||
private_ip = "172.23.2.25"
|
private_ip = "172.23.2.21"
|
||||||
|
location = "fsn1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,3 +32,15 @@ spec:
|
||||||
requests:
|
requests:
|
||||||
cpu: 50m
|
cpu: 50m
|
||||||
memory: 50Mi
|
memory: 50Mi
|
||||||
|
affinity:
|
||||||
|
podAntiAffinity:
|
||||||
|
preferredDuringSchedulingIgnoredDuringExecution:
|
||||||
|
- weight: 100
|
||||||
|
podAffinityTerm:
|
||||||
|
labelSelector:
|
||||||
|
matchExpressions:
|
||||||
|
- key: app.kubernetes.io/name
|
||||||
|
operator: In
|
||||||
|
values:
|
||||||
|
- fider
|
||||||
|
topologyKey: topology.kubernetes.io/zone
|
|
@ -40,6 +40,6 @@
|
||||||
BLOB_STORAGE_S3_ACCESS_KEY_ID: "{{ minio.rootUser | b64encode }}"
|
BLOB_STORAGE_S3_ACCESS_KEY_ID: "{{ minio.rootUser | b64encode }}"
|
||||||
BLOB_STORAGE_S3_SECRET_ACCESS_KEY: "{{ minio.rootPassword | b64encode }}"
|
BLOB_STORAGE_S3_SECRET_ACCESS_KEY: "{{ minio.rootPassword | b64encode }}"
|
||||||
|
|
||||||
- name: Create kubernetes resources for lookup output
|
- name: Deploy Fider kustomization
|
||||||
k8s:
|
k8s:
|
||||||
definition: "{{ lookup('kubernetes.core.kustomize', dir=([role_path, 'files'] | path_join)) }}"
|
definition: "{{ lookup('kubernetes.core.kustomize', dir=([role_path, 'files'] | path_join)) }}"
|
|
@ -168,7 +168,7 @@ apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: hcloud-csi
|
app: hcloud-csi-controller
|
||||||
name: hcloud-csi-controller-metrics
|
name: hcloud-csi-controller-metrics
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
spec:
|
spec:
|
||||||
|
@ -210,12 +210,14 @@ spec:
|
||||||
app: hcloud-csi-controller
|
app: hcloud-csi-controller
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/sig-storage/csi-attacher:v3.2.1
|
- args:
|
||||||
|
- --default-fstype=ext4
|
||||||
|
image: registry.k8s.io/sig-storage/csi-attacher:v4.1.0
|
||||||
name: csi-attacher
|
name: csi-attacher
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /run/csi
|
- mountPath: /run/csi
|
||||||
name: socket-dir
|
name: socket-dir
|
||||||
- image: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0
|
- image: registry.k8s.io/sig-storage/csi-resizer:v1.7.0
|
||||||
name: csi-resizer
|
name: csi-resizer
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /run/csi
|
- mountPath: /run/csi
|
||||||
|
@ -223,7 +225,7 @@ spec:
|
||||||
- args:
|
- args:
|
||||||
- --feature-gates=Topology=true
|
- --feature-gates=Topology=true
|
||||||
- --default-fstype=ext4
|
- --default-fstype=ext4
|
||||||
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
|
image: registry.k8s.io/sig-storage/csi-provisioner:v3.4.0
|
||||||
name: csi-provisioner
|
name: csi-provisioner
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /run/csi
|
- mountPath: /run/csi
|
||||||
|
@ -247,7 +249,7 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
key: token
|
key: token
|
||||||
name: hcloud
|
name: hcloud
|
||||||
image: hetznercloud/hcloud-csi-driver:2.1.0
|
image: hetznercloud/hcloud-csi-driver:v2.3.2
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
failureThreshold: 5
|
failureThreshold: 5
|
||||||
|
@ -267,7 +269,7 @@ spec:
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /run/csi
|
- mountPath: /run/csi
|
||||||
name: socket-dir
|
name: socket-dir
|
||||||
- image: k8s.gcr.io/sig-storage/livenessprobe:v2.3.0
|
- image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
name: liveness-probe
|
name: liveness-probe
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
@ -306,7 +308,7 @@ spec:
|
||||||
containers:
|
containers:
|
||||||
- args:
|
- args:
|
||||||
- --kubelet-registration-path=/var/lib/kubelet/plugins/csi.hetzner.cloud/socket
|
- --kubelet-registration-path=/var/lib/kubelet/plugins/csi.hetzner.cloud/socket
|
||||||
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
|
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0
|
||||||
name: csi-node-driver-registrar
|
name: csi-node-driver-registrar
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /run/csi
|
- mountPath: /run/csi
|
||||||
|
@ -322,7 +324,7 @@ spec:
|
||||||
value: 0.0.0.0:9189
|
value: 0.0.0.0:9189
|
||||||
- name: ENABLE_METRICS
|
- name: ENABLE_METRICS
|
||||||
value: "true"
|
value: "true"
|
||||||
image: hetznercloud/hcloud-csi-driver:2.1.0
|
image: hetznercloud/hcloud-csi-driver:v2.3.2
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
failureThreshold: 5
|
failureThreshold: 5
|
||||||
|
@ -349,7 +351,7 @@ spec:
|
||||||
name: plugin-dir
|
name: plugin-dir
|
||||||
- mountPath: /dev
|
- mountPath: /dev
|
||||||
name: device-dir
|
name: device-dir
|
||||||
- image: k8s.gcr.io/sig-storage/livenessprobe:v2.3.0
|
- image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
name: liveness-probe
|
name: liveness-probe
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
@ -386,7 +388,7 @@ metadata:
|
||||||
name: csi.hetzner.cloud
|
name: csi.hetzner.cloud
|
||||||
spec:
|
spec:
|
||||||
attachRequired: true
|
attachRequired: true
|
||||||
|
fsGroupPolicy: File
|
||||||
podInfoOnMount: true
|
podInfoOnMount: true
|
||||||
volumeLifecycleModes:
|
volumeLifecycleModes:
|
||||||
- Persistent
|
- Persistent
|
||||||
fsGroupPolicy: File
|
|
||||||
|
|
Loading…
Reference in a new issue