diff --git a/helm-values/nginx.yaml b/helm-values/nginx.yaml deleted file mode 100644 index fe9db32..0000000 --- a/helm-values/nginx.yaml +++ /dev/null @@ -1,9 +0,0 @@ -controller: - name: nginx - hostNetwork: true - service: - name: nginx - httpPort: - nodePort: 80 - httpsPort: - nodePort: 443 diff --git a/home-k8s/apply.sh b/home-k8s/apply.sh index ef4e5d6..ba04251 100755 --- a/home-k8s/apply.sh +++ b/home-k8s/apply.sh @@ -1,10 +1,6 @@ #! /bin/bash -eu -helm upgrade --install ingress bitnami/nginx-ingress-controller -n nginx-ingress --set hostNetwork=true \ ---set metrics.enabled=true \ ---set stats.enabled=true \ ---set metrics.serviceMonitor.enabled=true \ ---set metrics.serviceMonitor.namespace=default +helm upgrade --install ingress bitnami/nginx-ingress-controller -n nginx-ingress -f nginx-values.yaml helm install prometheus stable/prometheus-operator @@ -21,21 +17,8 @@ helm upgrade oauth2-proxy --install stable/oauth2-proxy \ k apply -f postgres-pv.yaml -helm upgrade --install postgres \ - -n db \ - --set image.repository=postgres \ - --set image.tag=11 \ - --set postgresqlDataDir=/var/lib/postgresql/data \ - --set persistence.mountPath=/var/lib/postgresql/data \ - --set postgresqlPassword="@wahyd4" \ - --set postgresqlDatabase=home \ - --set persistence.storageClass=manual \ - --set persistence.existingClaim=postgres-pvc \ - --set volumePermissions.enabled=true \ - --set securityContext.fsGroup=1000 \ - --set securityContext.runAsUser=1000 \ - --set service.type=NodePort \ - --set service.nodePort=32222 \ - --set metrics.enabled=true \ - --set metrics.serviceMonitor.enabled=true \ - bitnami/postgresql +helm upgrade --install postgres -n db -f postgres-values.yaml bitnami/postgresql + +# media + +k apply -f media-pv.yaml diff --git a/home-k8s/media-pv.yaml b/home-k8s/media-pv.yaml new file mode 100644 index 0000000..aa5a6ac --- /dev/null +++ b/home-k8s/media-pv.yaml @@ -0,0 +1,29 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: downloads + labels: + type: "local" +spec: + storageClassName: "manual" + capacity: + storage: "5000Gi" + accessModes: + - ReadWriteMany + hostPath: + path: "/mnt/downloads" + +--- + +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + namespace: media + name: downloads +spec: + storageClassName: "manual" + accessModes: + - ReadWriteMany + resources: + requests: + storage: "5000Gi" diff --git a/home-k8s/nginx-values.yaml b/home-k8s/nginx-values.yaml new file mode 100644 index 0000000..931124b --- /dev/null +++ b/home-k8s/nginx-values.yaml @@ -0,0 +1,9 @@ +hostNetwork: true +metrics: + enabled: true + serviceMonitor: + enabled: true + additionalLabels: + release: prometheus +stats: + enabled: true diff --git a/home-k8s/postgres-values.yaml b/home-k8s/postgres-values.yaml new file mode 100644 index 0000000..0fb0900 --- /dev/null +++ b/home-k8s/postgres-values.yaml @@ -0,0 +1,24 @@ +image: + repository: postgres + tag: 11 +postgresqlDataDir: /var/lib/postgresql/data +postgresqlPassword: "@wahyd4" +postgresqlDatabase: home +persistence: + mountPath: /var/lib/postgresql/data + storageClass: manual + existingClaim: postgres-pvc +volumePermissions: + enabled: true +securityContext: + fsGroup: 1000 + runAsUser: 1000 +service: + type: NodePort + nodePort: 32222 +metrics: + enabled: true + serviceMonitor: + enabled: true + additionalLabels: + release: prometheus