From 15a68f3238489d941b2972820f851c4185eccecc Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Fri, 29 Sep 2023 13:26:15 +0000 Subject: [PATCH] Remove cilium helm chart. --- .../kube-system/cilium/app/cilium-l2.yaml | 20 --- .../kube-system/cilium/app/helmrelease.yaml | 114 ------------------ .../kube-system/cilium/app/kustomization.yaml | 15 --- .../cilium/app/kustomizeconfig.yaml | 7 -- .../apps/kube-system/cilium/app/values.yaml | 47 -------- kubernetes/apps/kube-system/cilium/ks.yaml | 14 --- .../apps/kube-system/kustomization.yaml | 1 - 7 files changed, 218 deletions(-) delete mode 100644 kubernetes/apps/kube-system/cilium/app/cilium-l2.yaml delete mode 100644 kubernetes/apps/kube-system/cilium/app/helmrelease.yaml delete mode 100644 kubernetes/apps/kube-system/cilium/app/kustomization.yaml delete mode 100644 kubernetes/apps/kube-system/cilium/app/kustomizeconfig.yaml delete mode 100644 kubernetes/apps/kube-system/cilium/app/values.yaml delete mode 100644 kubernetes/apps/kube-system/cilium/ks.yaml diff --git a/kubernetes/apps/kube-system/cilium/app/cilium-l2.yaml b/kubernetes/apps/kube-system/cilium/app/cilium-l2.yaml deleted file mode 100644 index 6869ccd..0000000 --- a/kubernetes/apps/kube-system/cilium/app/cilium-l2.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -apiVersion: cilium.io/v2alpha1 -kind: CiliumL2AnnouncementPolicy -metadata: - name: policy -spec: - loadBalancerIPs: true - interfaces: - - ^eth1$ - nodeSelector: - matchLabels: - kubernetes.io/os: linux ---- -apiVersion: cilium.io/v2alpha1 -kind: CiliumLoadBalancerIPPool -metadata: - name: pool -spec: - cidrs: - - cidr: 10.2.42.0/24 diff --git a/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml b/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml deleted file mode 100644 index a032c66..0000000 --- a/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml +++ /dev/null @@ -1,114 +0,0 @@ ---- -# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: cilium - namespace: kube-system -spec: - interval: 30m - chart: - spec: - chart: cilium - version: 1.14.2 - sourceRef: - kind: HelmRepository - name: cilium - namespace: flux-system - maxHistory: 2 - install: - remediation: - retries: 3 - upgrade: - cleanupOnFail: true - remediation: - retries: 3 - uninstall: - keepHistory: false - values: - autoDirectNodeRoutes: true - bpf: - masquerade: true - bgp: - enabled: false - cluster: - name: kubernetes - id: 1 - containerRuntime: - integration: containerd - socketPath: /var/run/k3s/containerd/containerd.sock - endpointRoutes: - enabled: true - hubble: - enabled: true - metrics: - enabled: - - dns:query - - drop - - tcp - - flow - - port-distribution - - icmp - - http - serviceMonitor: - enabled: true - dashboards: - enabled: true - annotations: - grafana_folder: Cilium - relay: - enabled: true - rollOutPods: true - prometheus: - serviceMonitor: - enabled: true - ui: - enabled: true - rollOutPods: true - ingress: - enabled: true - className: nginx - hosts: - - &host hubble.valinor.social - tls: - - hosts: - - *host - ipam: - mode: kubernetes - ipv4NativeRoutingCIDR: 10.32.0.0/16 - k8sServiceHost: 10.2.0.6 - k8sServicePort: 6443 - kubeProxyReplacement: true - kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256 - l2announcements: - enabled: true - leaseDuration: 120s - leaseRenewDeadline: 60s - leaseRetryPeriod: 1s - loadBalancer: - algorithm: maglev - mode: dsr - localRedirectPolicy: true - operator: - rollOutPods: true - prometheus: - enabled: true - serviceMonitor: - enabled: true - dashboards: - enabled: true - annotations: - grafana_folder: Cilium - prometheus: - enabled: true - serviceMonitor: - enabled: true - trustCRDsExist: true - dashboards: - enabled: true - annotations: - grafana_folder: Cilium - rollOutCiliumPods: true - securityContext: - privileged: true - tunnel: disabled diff --git a/kubernetes/apps/kube-system/cilium/app/kustomization.yaml b/kubernetes/apps/kube-system/cilium/app/kustomization.yaml deleted file mode 100644 index d5ca0be..0000000 --- a/kubernetes/apps/kube-system/cilium/app/kustomization.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# yaml-language-server: $schema=https://json.schemastore.org/kustomization.json -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: kube-system -resources: - - ./helmrelease.yaml - - ./cilium-l2.yaml -configMapGenerator: - - name: cilium-values - files: - - values.yaml=./values.yaml - -configurations: - - kustomizeconfig.yaml \ No newline at end of file diff --git a/kubernetes/apps/kube-system/cilium/app/kustomizeconfig.yaml b/kubernetes/apps/kube-system/cilium/app/kustomizeconfig.yaml deleted file mode 100644 index 1fcad09..0000000 --- a/kubernetes/apps/kube-system/cilium/app/kustomizeconfig.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -nameReference: - - kind: ConfigMap - version: v1 - fieldSpecs: - - path: spec/valuesFrom/name - kind: HelmRelease \ No newline at end of file diff --git a/kubernetes/apps/kube-system/cilium/app/values.yaml b/kubernetes/apps/kube-system/cilium/app/values.yaml deleted file mode 100644 index 253e809..0000000 --- a/kubernetes/apps/kube-system/cilium/app/values.yaml +++ /dev/null @@ -1,47 +0,0 @@ -cgroup: - autoMount: - enabled: false - hostRoot: /sys/fs/cgroup -ipam: - mode: kubernetes -k8sServiceHost: localhost -k8sServicePort: 7445 -kubeProxyReplacement: true -operator: - rollOutPods: true - prometheus: - enabled: true - serviceMonitor: - enabled: true - dashboards: - enabled: true - annotations: - grafana_folder: Cilium -prometheus: - enabled: true - serviceMonitor: - enabled: true - trustCRDsExist: true -dashboards: - enabled: true - annotations: - grafana_folder: Cilium -rollOutCiliumPods: true -securityContext: - capabilities: - ciliumAgent: - - CHOWN - - KILL - - NET_ADMIN - - NET_RAW - - IPC_LOCK - - SYS_ADMIN - - SYS_RESOURCE - - DAC_OVERRIDE - - FOWNER - - SETGID - - SETUID - cleanCiliumState: - - NET_ADMIN - - SYS_ADMIN - - SYS_RESOURCE diff --git a/kubernetes/apps/kube-system/cilium/ks.yaml b/kubernetes/apps/kube-system/cilium/ks.yaml deleted file mode 100644 index 3d994ab..0000000 --- a/kubernetes/apps/kube-system/cilium/ks.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: cluster-apps-cilium - namespace: flux-system -spec: - interval: 10m - path: "./kubernetes/apps/kube-system/cilium/app" - prune: true - sourceRef: - kind: GitRepository - name: valinor - wait: true diff --git a/kubernetes/apps/kube-system/kustomization.yaml b/kubernetes/apps/kube-system/kustomization.yaml index f269ea1..a8875ab 100644 --- a/kubernetes/apps/kube-system/kustomization.yaml +++ b/kubernetes/apps/kube-system/kustomization.yaml @@ -6,4 +6,3 @@ resources: - ./namespace.yaml # Flux-Kustomizations - ./metrics-server/ks.yaml - - ./cilium/ks.yaml