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.

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

feat: remove kubelet-csr-approver #25

Merged
merged 1 commit into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .taskfiles/Talos/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tasks:
cmds:
- task: '{{if ne .ROLLOUT true}}down{{else}}noop{{end}}'
- talosctl --nodes {{.HOSTNAME}} upgrade --image="factory.talos.dev/installer/{{.TALOS_SCHEMATIC_ID}}:{{.TALOS_VERSION}}" --timeout=10m
- talosctl --nodes {{.HOSTNAME}} health --wait-timeout=10m --server=false
- talosctl --nodes {{.HOSTNAME}} health
- task: '{{if ne .ROLLOUT true}}up{{else}}noop{{end}}'
vars:
TALOS_SCHEMATIC_ID:
Expand Down
1 change: 0 additions & 1 deletion .taskfiles/bootstrap/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ tasks:
- which flux kubectl sops

apps:
internal: true
dir: '{{.KUBERNETES_DIR}}/bootstrap/talos'
cmds:
- until kubectl wait --for=condition=Ready=False nodes --all --timeout=600s; do sleep 10; done
Expand Down
6 changes: 3 additions & 3 deletions config/talos/clusterconfig/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
olympus-artemis.yaml
olympus-apollo.yaml
olympus-athena.yaml
talosconfig
valhalla-odin.yaml
valhalla-thor.yaml
valhalla-frigg.yaml
10 changes: 5 additions & 5 deletions config/talos/talconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# renovate: datasource=docker depName=ghcr.io/siderolabs/installer
talosVersion: v1.9.0
# renovate: datasource=docker depName=ghcr.io/siderolabs/kubelet
kubernetesVersion: v1.32.0
kubernetesVersion: v1.31.0

clusterName: "olympus"
clusterName: "valhalla"
endpoint: https://192.168.2.101:6443
clusterPodNets:
- "10.69.0.0/16"
Expand All @@ -21,7 +21,7 @@ cniConfig:
name: none

nodes:
- hostname: "artemis"
- hostname: "odin"
ipAddress: "192.168.2.102"
installDisk: "/dev/sda"
talosImageURL: factory.talos.dev/installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
Expand All @@ -38,7 +38,7 @@ nodes:
mtu: 1500
vip:
ip: "192.168.2.101"
- hostname: "apollo"
- hostname: "thor"
ipAddress: "192.168.2.103"
installDisk: "/dev/sda"
talosImageURL: factory.talos.dev/installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
Expand All @@ -55,7 +55,7 @@ nodes:
mtu: 1500
vip:
ip: "192.168.2.101"
- hostname: "athena"
- hostname: "frigg"
ipAddress: "192.168.2.104"
installDisk: "/dev/sda"
talosImageURL: factory.talos.dev/installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
Expand Down
42 changes: 21 additions & 21 deletions config/talos/talsecret.sops.yaml

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions kubernetes/apps/kube-system/kubelet-csr-approver/ks.yaml

This file was deleted.

1 change: 0 additions & 1 deletion kubernetes/apps/kube-system/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ resources:
- ./csi-driver-nfs/ks.yaml
- ./metrics-server/ks.yaml
- ./reloader/ks.yaml
- ./kubelet-csr-approver/ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ spec:
retries: 3
values:
args:
- --kubelet-insecure-tls
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
- --kubelet-use-node-status-port
- --metric-resolution=15s
- --metric-resolution=10s
- --kubelet-request-timeout=2s
metrics:
enabled: true
serviceMonitor:
Expand Down
13 changes: 0 additions & 13 deletions kubernetes/bootstrap/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ repositories:
url: https://helm.cilium.io
- name: coredns
url: https://coredns.github.io/helm
- name: postfinance
url: https://postfinance.github.io/kubelet-csr-approver

releases:
- name: prometheus-operator-crds
Expand All @@ -36,16 +34,6 @@ releases:
needs:
- observability/prometheus-operator-crds
- kube-system/cilium
- name: kubelet-csr-approver
namespace: kube-system
chart: postfinance/kubelet-csr-approver
version: 1.2.3
values:
- ../apps/kube-system/kubelet-csr-approver/app/helm-values.yaml
needs:
- observability/prometheus-operator-crds
- kube-system/cilium
- kube-system/coredns
- name: spegel
namespace: kube-system
chart: oci://ghcr.io/spegel-org/helm-charts/spegel
Expand All @@ -56,4 +44,3 @@ releases:
- observability/prometheus-operator-crds
- kube-system/cilium
- kube-system/coredns
- kube-system/kubelet-csr-approver
4 changes: 4 additions & 0 deletions kubernetes/config/talos/clusterconfig/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
valhalla-odin.yaml
valhalla-thor.yaml
valhalla-frigg.yaml
talosconfig
1 change: 0 additions & 1 deletion kubernetes/flux/repositories/helm/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ resources:
- ./ingress-nginx.yaml
- ./openebs.yaml
- ./pireaus.yaml
- ./postfinance.yaml
- ./prometheus-community.yaml
- ./rook-ceph.yaml
- ./spegel.yaml
Expand Down
9 changes: 0 additions & 9 deletions kubernetes/flux/repositories/helm/postfinance.yaml

This file was deleted.

Loading