diff --git a/.gitattributes b/.gitattributes index 110be7a..2204c04 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -*.secret filter=git-crypt diff=git-crypt \ No newline at end of file +*.secret filter=git-crypt diff=git-crypt +*.secret.yaml filter=git-crypt diff=git-crypt \ No newline at end of file diff --git a/k8s/README.md b/k8s/README.md index 46c40d2..a745c43 100644 --- a/k8s/README.md +++ b/k8s/README.md @@ -19,7 +19,7 @@ kubectl get pods | grep Error | cut -d' ' -f 1 | xargs kubectl delete pod ## namespaces ```sh -namespaces="flux cert-manager nginx-ingress infrapuzzle kuard auth nextcloud datalab web development storageos-operator" +namespaces="flux cert-manager nginx-ingress infrapuzzle kuard auth nextcloud datalab web development longhorn-system" for i in $( echo $NAMESPACES ) ; do k create ns $i done @@ -65,10 +65,13 @@ $ kubectl apply -f kuard $ kubectl delete -f kuard ``` -## storageos +## longhorn-system ```sh -kubectl apply -f storageos-operator/storageos.yaml +# on node: +sudo yum install -y iscsi-initiator-utils +# locally +kubectl apply -f longhorn-system/longhorn.yaml ``` ## auth diff --git a/k8s/datalab/corona-api.yaml b/k8s/datalab/corona-api.yaml index 930719d..bc96fa9 100644 --- a/k8s/datalab/corona-api.yaml +++ b/k8s/datalab/corona-api.yaml @@ -42,7 +42,7 @@ spec: apiVersion: extensions/v1beta1 kind: Ingress metadata: - name: corona-api + name: corona-api-haumdaucher namespace: datalab annotations: kubernetes.io/ingress.class: "nginx" @@ -65,7 +65,7 @@ spec: apiVersion: extensions/v1beta1 kind: Ingress metadata: - name: corona-api + name: corona-api-moritzgraf namespace: datalab annotations: kubernetes.io/ingress.class: "nginx" diff --git a/k8s/datalab/corona.yaml b/k8s/datalab/corona.yaml index d7e114c..3445ef8 100644 --- a/k8s/datalab/corona.yaml +++ b/k8s/datalab/corona.yaml @@ -42,7 +42,7 @@ spec: apiVersion: extensions/v1beta1 kind: Ingress metadata: - name: corona + name: corona-haumdaucher namespace: datalab annotations: kubernetes.io/ingress.class: "nginx" @@ -65,7 +65,7 @@ spec: apiVersion: extensions/v1beta1 kind: Ingress metadata: - name: corona + name: corona-moritzgraf namespace: datalab annotations: kubernetes.io/ingress.class: "nginx" diff --git a/k8s/longhorn-system/longhorn.yaml b/k8s/longhorn-system/longhorn.yaml new file mode 100644 index 0000000..c6543ab --- /dev/null +++ b/k8s/longhorn-system/longhorn.yaml @@ -0,0 +1,22 @@ +# status: implemented + +apiVersion: helm.fluxcd.io/v1 +kind: HelmRelease +metadata: + name: helm-longhorn + namespace: flux +spec: + releaseName: longhorn + targetNamespace: longhorn-system + chart: + git: https://github.com/longhorn/longhorn.git + path: "chart/" + ref: "v0.8.0" + # values: + # replicaCount: 1 + # webhook: + # replicaCount: 1 + # podLabels: + # app: cert-manager + # prometheus: + # enabled: false \ No newline at end of file diff --git a/k8s/storageos-operator/storageos.yaml b/k8s/storageos-operator/storageos.yaml deleted file mode 100644 index 5dd3854..0000000 --- a/k8s/storageos-operator/storageos.yaml +++ /dev/null @@ -1,14 +0,0 @@ -# status: chart not working with helm3 - -# apiVersion: helm.fluxcd.io/v1 -# kind: HelmRelease -# metadata: -# name: helm-storageos -# namespace: flux -# spec: -# releaseName: storageos -# targetNamespace: storageos-operator -# chart: -# repository: https://charts.storageos.com -# version: 0.2.19 -# name: storageos \ No newline at end of file diff --git a/terraform/1.58532e+09 b/terraform/1.58532e+09 deleted file mode 100644 index 9eb88db..0000000 Binary files a/terraform/1.58532e+09 and /dev/null differ