From 58146a07a2131fb2b73ef9811ad323de82b26414 Mon Sep 17 00:00:00 2001 From: Moritz Graf Date: Fri, 10 Apr 2020 02:18:12 +0200 Subject: [PATCH] small fix with corona --- .gitattributes | 3 ++- k8s/README.md | 9 ++++++--- k8s/datalab/corona-api.yaml | 4 ++-- k8s/datalab/corona.yaml | 4 ++-- k8s/longhorn-system/longhorn.yaml | 22 ++++++++++++++++++++++ k8s/storageos-operator/storageos.yaml | 14 -------------- terraform/1.58532e+09 | Bin 21592 -> 0 bytes 7 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 k8s/longhorn-system/longhorn.yaml delete mode 100644 k8s/storageos-operator/storageos.yaml delete mode 100644 terraform/1.58532e+09 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 9eb88dbf25ee04cada40aed4e65cea2eb4403cb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21592 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