diff --git a/README.md b/README.md index fee1e83b071..59077cd86ab 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ The features included will depend on the type of configuration you want to use. 1. **"Flux cluster"** - a Kubernetes cluster deployed on-top of [Talos Linux](https://github.com/siderolabs/talos) with an opinionated implementation of [Flux](https://github.com/fluxcd/flux2) using [GitHub](https://github.com/) as the Git provider and [sops](https://github.com/getsops/sops) to manage secrets. - **Required:** Some knowledge of [Containers](https://opencontainers.org/), [YAML](https://yaml.org/), and [Git](https://git-scm.com/). - - **Components:** [flux](https://github.com/fluxcd/flux2), [cilium](https://github.com/cilium/cilium), [cert-manager](https://github.com/cert-manager/cert-manager), [spegel](https://github.com/spegel-org/spegel), [reloader](https://github.com/stakater/Reloader), and [openebs](https://github.com/openebs/openebs). + - **Components:** [flux](https://github.com/fluxcd/flux2), [cilium](https://github.com/cilium/cilium), [cert-manager](https://github.com/cert-manager/cert-manager), [spegel](https://github.com/spegel-org/spegel), and [reloader](https://github.com/stakater/Reloader). 2. **"Flux cluster with Cloudflare"** - An addition to "**Flux cluster**" that provides DNS and SSL with [Cloudflare](https://www.cloudflare.com/). [Cloudflare Tunnel](https://www.cloudflare.com/products/tunnel/) is also included to provide external access to certain applications deployed in your cluster. @@ -125,7 +125,7 @@ There are **4 stages** outlined below for completing this project, make sure you 4. Watch the rollout of your cluster happen: - 📍 _Depending on the features you choose a successful rollout will include pods being deployed into the **cert-manager, flux-system, network and openebs-system** namespaces_ + 📍 _Depending on the features you choose a successful rollout will include pods being deployed into the **cert-manager, flux-system, kube-system and network** namespaces_ ```sh watch kubectl get pods --all-namespaces @@ -330,8 +330,8 @@ Instead of using [k8s_gateway](https://github.com/ori-edge/k8s_gateway) to provi ### Storage -The included CSI (openebs in local-hostpath mode) is a great start for storage but soon you might find you need more features like replicated block storage, or to connect to a NFS/SMB/iSCSI server. If you need any of those features be sure to check out the projects like [rook-ceph](https://github.com/rook/rook), [longhorn](https://github.com/longhorn/longhorn), [openebs](https://github.com/openebs/openebs), [democratic-csi](https://github.com/democratic-csi/democratic-csi), [csi-driver-nfs](https://github.com/kubernetes-csi/csi-driver-nfs), -and [synology-csi](https://github.com/SynologyOpenSource/synology-csi). +You might find you need persistent storage for your workloads with features like replicated storage or to connect to a NFS/SMB/iSCSI server. If you need any of those features be sure to check out the projects like [rook-ceph](https://github.com/rook/rook), [longhorn](https://github.com/longhorn/longhorn), [openebs](https://github.com/openebs/openebs), [democratic-csi](https://github.com/democratic-csi/democratic-csi), [csi-driver-nfs](https://github.com/kubernetes-csi/csi-driver-nfs), [csi-driver-smb](https://github.com/kubernetes-csi/csi-driver-smb) +or [synology-csi](https://github.com/SynologyOpenSource/synology-csi). ### Community Repositories diff --git a/templates/config/kubernetes/apps/openebs-system/kustomization.yaml.j2 b/templates/config/kubernetes/apps/openebs-system/kustomization.yaml.j2 deleted file mode 100644 index 6d307544add..00000000000 --- a/templates/config/kubernetes/apps/openebs-system/kustomization.yaml.j2 +++ /dev/null @@ -1,16 +0,0 @@ ---- -# yaml-language-server: $schema=https://json.schemastore.org/kustomization -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ./openebs/ks.yaml -components: - - ../../flux/components/namespace -patches: - - # Add the name to the namespace - patch: | - - op: add - path: /metadata/name - value: openebs-system - target: - kind: Namespace diff --git a/templates/config/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml.j2 deleted file mode 100644 index 040a1df79d2..00000000000 --- a/templates/config/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml.j2 +++ /dev/null @@ -1,49 +0,0 @@ ---- -# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: openebs -spec: - interval: 30m - chart: - spec: - chart: openebs - version: 4.1.3 - sourceRef: - kind: HelmRepository - name: openebs - namespace: flux-system - install: - remediation: - retries: 3 - upgrade: - cleanupOnFail: true - remediation: - retries: 3 - values: - engines: - local: - lvm: - enabled: false - zfs: - enabled: false - replicated: - mayastor: - enabled: false - openebs-crds: - csi: - volumeSnapshots: - enabled: false - localpv-provisioner: - localpv: - image: - registry: quay.io/ - helperPod: - image: - registry: quay.io/ - hostpathClass: - enabled: true - name: openebs-hostpath - isDefaultClass: false - basePath: /var/openebs/local diff --git a/templates/config/kubernetes/apps/openebs-system/openebs/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/openebs-system/openebs/app/kustomization.yaml.j2 deleted file mode 100644 index 17cbc72b25c..00000000000 --- a/templates/config/kubernetes/apps/openebs-system/openebs/app/kustomization.yaml.j2 +++ /dev/null @@ -1,6 +0,0 @@ ---- -# yaml-language-server: $schema=https://json.schemastore.org/kustomization -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ./helmrelease.yaml diff --git a/templates/config/kubernetes/apps/openebs-system/openebs/ks.yaml.j2 b/templates/config/kubernetes/apps/openebs-system/openebs/ks.yaml.j2 deleted file mode 100644 index bcff471bc81..00000000000 --- a/templates/config/kubernetes/apps/openebs-system/openebs/ks.yaml.j2 +++ /dev/null @@ -1,20 +0,0 @@ ---- -# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app openebs - namespace: flux-system -spec: - targetNamespace: openebs-system - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./kubernetes/apps/openebs-system/openebs/app - prune: true - sourceRef: - kind: GitRepository - name: flux-system - wait: false - interval: 30m - timeout: 5m diff --git a/templates/config/kubernetes/bootstrap/talos/patches/global/machine-kubelet.yaml.j2 b/templates/config/kubernetes/bootstrap/talos/patches/global/machine-kubelet.yaml.j2 index 0b9befdf64a..dbe5aea4b5e 100644 --- a/templates/config/kubernetes/bootstrap/talos/patches/global/machine-kubelet.yaml.j2 +++ b/templates/config/kubernetes/bootstrap/talos/patches/global/machine-kubelet.yaml.j2 @@ -1,13 +1,5 @@ machine: kubelet: - extraMounts: - - destination: /var/openebs/local - type: bind - source: /var/openebs/local - options: - - bind - - rshared - - rw nodeIP: validSubnets: - #{ node_network }# diff --git a/templates/config/kubernetes/flux/meta/repositories/helm/kustomization.yaml.j2 b/templates/config/kubernetes/flux/meta/repositories/helm/kustomization.yaml.j2 index a47714d735c..aab79770042 100644 --- a/templates/config/kubernetes/flux/meta/repositories/helm/kustomization.yaml.j2 +++ b/templates/config/kubernetes/flux/meta/repositories/helm/kustomization.yaml.j2 @@ -12,7 +12,6 @@ resources: - ./jetstack.yaml - ./k8s-gateway.yaml - ./metrics-server.yaml - - ./openebs.yaml - ./prometheus-community.yaml - ./spegel.yaml - ./stakater.yaml diff --git a/templates/config/kubernetes/flux/meta/repositories/helm/openebs.yaml.j2 b/templates/config/kubernetes/flux/meta/repositories/helm/openebs.yaml.j2 deleted file mode 100644 index c8419a9632d..00000000000 --- a/templates/config/kubernetes/flux/meta/repositories/helm/openebs.yaml.j2 +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: openebs - namespace: flux-system -spec: - interval: 1h - url: https://openebs.github.io/openebs