From 8dcbe4fbe33937b28dc394876caf684eccd2e649 Mon Sep 17 00:00:00 2001 From: Amarpreet Minhas Date: Mon, 10 Jul 2023 22:45:43 +0000 Subject: [PATCH] Finish nextcloud migration to argo --- helm/nextcloud/external-secrets.yaml | 76 ---------------------------- helm/nextcloud/install.sh | 39 -------------- helm/nextcloud/istio-ingress.yaml | 65 ------------------------ helm/nextcloud/values.yaml | 53 ------------------- 4 files changed, 233 deletions(-) delete mode 100644 helm/nextcloud/external-secrets.yaml delete mode 100755 helm/nextcloud/install.sh delete mode 100644 helm/nextcloud/istio-ingress.yaml delete mode 100644 helm/nextcloud/values.yaml diff --git a/helm/nextcloud/external-secrets.yaml b/helm/nextcloud/external-secrets.yaml deleted file mode 100644 index fff1207..0000000 --- a/helm/nextcloud/external-secrets.yaml +++ /dev/null @@ -1,76 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -type: kubernetes.io/service-account-token -metadata: - name: serviceaccounttoken - namespace: nextcloud - annotations: - kubernetes.io/service-account.name: "nextcloud" -... ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: nextcloud-tokenreview-binding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: system:auth-delegator -subjects: -- kind: ServiceAccount - name: nextcloud - namespace: nextcloud -... ---- -apiVersion: external-secrets.io/v1beta1 -kind: SecretStore -metadata: - name: nextcloud - namespace: nextcloud -spec: - provider: - vault: - server: "https://vault.service.masked.name:8200" - path: "kv" - version: "v2" - caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUROVENDQWgyZ0F3SUJBZ0lVWXA4eG81dDJsSkZQM1NpRDFmSmlyZ0dVUUowd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF4TUxiV0Z6YTJWa0xtNWhiV1V3SGhjTk1qQXdPREk1TVRreU16RXlXaGNOTXpBdwpPREkzTVRreU16UXlXakFXTVJRd0VnWURWUVFERXd0dFlYTnJaV1F1Ym1GdFpUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFNSTdvUitLSHZ2em5mbmFBWERNTzVxcFNUQ0FZQ3lmakZFb2hZSmYKbE9jbkxPTlhiM2Y2c1A1ZDFlbHRMK1VUcTBSVlU1VVAwYU5XN2hxRFRhNDFNUncwSkNEdEI2OHlLZFlxMmhaZgo5N2dBK2xqM01FSlU2UlRBS0xyZzc1R1JoL0FiTkVJZ3d2UHVIS1c2aE1idHdPeU05REZVLy9XM3hwdXNhbFh5ClJNRnpBSGZTRGo5Y2krVXlnVXQ5SElOV2QvU21NR0cvOFBnaGFSaGZFNDR3UkZNcVllemVsaUl0MkpJczQzQlYKN0hxRzBPZXY5V1BlWG1pYVpVWUtRZXRIaVFxUjE0TXhpdjFJR3pDbXd3Tis5YjR0WnRaVGE1OG9NNWRQWGZiYgpsckVMUUU1T3NQYU50TXRFUjNNZ3hvdkROM1ZTQ0dIL08vR3lhRVdWYW5ZNVVGOENBd0VBQWFON01Ia3dEZ1lEClZSMFBBUUgvQkFRREFnRUdNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdIUVlEVlIwT0JCWUVGQlk4alczZkRWVXAKVVJ0MXByaG1ETWprVmlrZ01COEdBMVVkSXdRWU1CYUFGQlk4alczZkRWVXBVUnQxcHJobURNamtWaWtnTUJZRwpBMVVkRVFRUE1BMkNDMjFoYzJ0bFpDNXVZVzFsTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFBV1F6NGQzUXpFClc4TkdBMTZaUGFtbFZ1Yk9MQjVEdFp6MnFyU3JuM0RlT2JMSURTaEluVjNxdFJsRHg5SFlKTFRDQTc1S2V0MEoKTlRzeU1jVHkydHhkNEk4aGdkRjMwWEplRWNpTjl3WjBtS0VlUC9ZS0R3ZThWMlh3V3E0WFlrRGVjaGxXSHBabwpQZldjb0xwckt3VlVJNEh6YXFrTm13Y21NVUk0eEFzQytTTGUxbXJlYnNlS200OW9Pd2RRcy9vUFZMSyswbkVwClJ2RDBhT3ZvaElMSWEvMlp0S2N6dmhCL0wzZm81cGc5RXgvMEpEQmRESEllZE1hYkQzcW44SWRzZStQNURmd2EKSnUyQ3R5YituMVRUUHhSRE14czJjRmJBNWlycisyQVJKZDhqdEdTKzFmeXhvZ2pPV1MxUlI1MjNGK3FJUzNzdQpLaWJHZWwrZ0ZQcHEKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJRDB6Q0NBcnVnQXdJQkFnSVVNNTJ1aFhTZVRDaW0xcG16dWNtL2NuSWdOcDh3RFFZSktvWklodmNOQVFFTApCUUF3RmpFVU1CSUdBMVVFQXhNTGJXRnphMlZrTG01aGJXVXdIaGNOTWpBd09ESTVNVGt5TnpBd1doY05NalV3Ck9ESTRNVGt5TnpNd1dqQXRNU3N3S1FZRFZRUURFeUp0WVhOclpXUXVibUZ0WlNCSmJuUmxjbTFsWkdsaGRHVWcKUVhWMGFHOXlhWFI1TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUE4THVHbytBcwpJQ1lXZEpqQkNZMHNuRi9YK2pGMXRkY3JRek5pUktFU0ViNWRzRGl5OTc5YnVnQ2JsUFFEUStnNVdHcVhYNHBqClV5WlpFM1p3aE91ZklTbEdLMG93MWFNanFTK3BGbFE4NUtSRC9qVXRMUFJVSnVRRittMll3SWQvTWc2L0I3UWsKZDE2NnVKa054UytNR1pDaTJPWVhlb2l2bk9ZN1EwS2ovMHZJYmM1VnQza0NSVmcybGpMU1Fob0JkKzg1QUhNUgpqZVJqWk1lWUVZRjJIVFZ3cmc0RHJDL3IwME1WdERjTnFzNitNN1laL3J6bnk3M0d2ZkpXZldvQjFDNHBpWmxnCmZ2VWNTREw1SEFoaml1NWNTZUlSN0RUdVZ4N3Q0UG9LNkFxVWtQeWdEdHExWmFMeWJYVDdYNmQwNzJkUjVBWE8KbldGTFBhYUdKOTc5aXdJREFRQUJvNElCQURDQi9UQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0R3WURWUjBUQVFILwpCQVV3QXdFQi96QWRCZ05WSFE0RUZnUVVJa2hWWUJhSzlDY3ZYRzhGTTJqS1ZaMTZvWkF3SHdZRFZSMGpCQmd3CkZvQVVGanlOYmQ4TlZTbFJHM1dtdUdZTXlPUldLU0F3VVFZSUt3WUJCUVVIQVFFRVJUQkRNRUVHQ0NzR0FRVUYKQnpBQ2hqVm9kSFJ3T2k4dmRtRjFiSFF1WTI5c2RXMWlhV0V1YldGemEyVmtMbTVoYldVNk9ESXdNQzkyTVM5dwphMmxmY205dmRDOWpZVEJIQmdOVkhSOEVRREErTUR5Z09xQTRoalpvZEhSd09pOHZkbUYxYkhRdVkyOXNkVzFpCmFXRXViV0Z6YTJWa0xtNWhiV1U2T0RJd01DOTJNUzl3YTJsZmNtOXZkQzlqY213d0RRWUpLb1pJaHZjTkFRRUwKQlFBRGdnRUJBSzZITWdSK2hwd2paQ21mNU5zekRTSHI3ZFlLWlhQNExyY0hQV3M5NG5MTTMzVVo1NzJ1YkdIcwpkS2pSdzhZRDBjbmNyc3lwc1ltRWdSNTdVK0RIa3lzMzk0d2tiN1VPd3kxWnZkNUlJUlhkUDBjRHlsejBRenFNCkFQblFZTitpc21rb2xqaGs5ZXkwUWJvM0NtUGpNK1VRY0F4dVpRdEE0TStyaUMxK2prdWRlMXVZTDBzekM2WTkKNEtldGZ2Yk5rZWRTYVY1eUphUktDQmhSY0M0L0dqcEJHL29kUS81QWZCUEFGalpxaGNJSldCclZZYlRRVkM3OQpoTUExaXdXSlBtVDlMc2pNU1VmeEZUUHp4Um5OWFFpS0Z6NWtUMk9pUzFucWg4YU9jeVU5WUM5Mjhwa2lmTkpWCktva3VEZXpKRk03aWUzZCtFY0JrMVY5bEh3T1dkdG89Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - auth: - kubernetes: - mountPath: "k8s-teapot" - role: "nextcloud" - secretRef: - name: "serviceaccounttoken" -... ---- -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: nextcloud - namespace: nextcloud -spec: - secretStoreRef: - name: nextcloud - kind: SecretStore - data: - - secretKey: username - remoteRef: - key: nextcloud - property: username - - secretKey: password - remoteRef: - key: nextcloud - property: password - - secretKey: db_username - remoteRef: - key: nextcloud - property: db_username - - secretKey: db_password - remoteRef: - key: nextcloud - property: db_password - - secretKey: serverinfo_token - remoteRef: - key: nextcloud - property: serverinfo_token -... diff --git a/helm/nextcloud/install.sh b/helm/nextcloud/install.sh deleted file mode 100755 index be96ff2..0000000 --- a/helm/nextcloud/install.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -CHART_VERSION=3.3.6 -NAMESPACE=nextcloud -VAULT_AUTH_NAMESPACE="k8s-teapot" - -helm repo add nextcloud https://nextcloud.github.io/helm/ -helm repo update - -kubectl create ns nextcloud -kubectl create serviceaccount -n ${NAMESPACE} nextcloud -cat << EOH > nextcloud.hcl -path "kv/data/nextcloud" { - capabilities = ["read"] -} -EOH -vault policy write nextcloud nextcloud.hcl -rm nextcloud.hcl -HOST_IP=$(ip addr show eth0 | grep -Po 'inet \K[\d.]+') -TOKEN="$(kubectl get secret serviceaccounttoken -n nextcloud -o go-template='{{ .data.token }}' | base64 -d)" - -vault write auth/${VAULT_AUTH_NAMESPACE}/role/nextcloud \ - bound_service_account_names=nextcloud \ - bound_service_account_namespaces=nextcloud \ - policies=nextcloud \ - ttl=24h - -vault write auth/${VAULT_AUTH_NAMESPACE}/login role=nextcloud jwt=${TOKEN} iss=https://${HOST_IP}:6443 - -kubectl apply -n ${NAMESPACE} -f external-secrets.yaml -kubectl apply -n ${NAMESPACE} -f pvc.yaml - -helm upgrade --install \ - nextcloud \ - nextcloud/nextcloud \ - -f values.yaml \ - -n ${NAMESPACE} \ - --version ${CHART_VERSION} \ - --cleanup-on-fail diff --git a/helm/nextcloud/istio-ingress.yaml b/helm/nextcloud/istio-ingress.yaml deleted file mode 100644 index a2218ea..0000000 --- a/helm/nextcloud/istio-ingress.yaml +++ /dev/null @@ -1,65 +0,0 @@ ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: nextcloud-cert - namespace: istio-system -spec: - secretName: nextcloud-cert - commonName: nextcloud.minhas.io - dnsNames: - - nextcloud.minhas.io - issuerRef: - name: letsencrypt-prod - kind: ClusterIssuer - group: cert-manager.io -... ---- -apiVersion: networking.istio.io/v1beta1 -kind: Gateway -metadata: - name: nextcloud-gateway - namespace: nextcloud -spec: - selector: - istio: ingressgateway - servers: - - port: - number: 443 - name: https - protocol: HTTPS - tls: - mode: SIMPLE - credentialName: nextcloud-cert - hosts: - - nextcloud.minhas.io - - port: - number: 80 - name: http - protocol: HTTP - tls: - httpsRedirect: true - hosts: - - nextcloud.minhas.io -... ---- -apiVersion: networking.istio.io/v1beta1 -kind: VirtualService -metadata: - name: nextcloud-gateway - namespace: nextcloud -spec: - hosts: - - nextcloud.minhas.io - gateways: - - nextcloud-gateway - http: - - match: - - uri: - prefix: / - route: - - destination: - port: - number: 80 - host: nextcloud -... diff --git a/helm/nextcloud/values.yaml b/helm/nextcloud/values.yaml deleted file mode 100644 index d0ca616..0000000 --- a/helm/nextcloud/values.yaml +++ /dev/null @@ -1,53 +0,0 @@ ---- -image: - flavor: fpm -nextcloud: - host: nextcloud.minhas.io - update: 1 - existingSecret: - enabled: true - secretName: nextcloud - usernameKey: username - passwordKey: password - tokenKey: serverinfo_token - containerPort: 80 - datadir: /var/www/html/data - defaultConfigs: - redis.config.php: false - smtp.config.php: false - -service: - type: ClusterIP - port: 80 - -replicaCount: 1 -persistence: - enabled: true - existingClaim: "nextcloud" - -internalDatabase: - enabled: false - -externalDatabase: - type: postgresql - host: sedan.minhas.io - existingSecret: - enabled: true - secretName: nextcloud - usernameKey: db_username - passwordKey: db_password - -nginx: - enabled: true - -phpClientHttpsFix: - enabled: true - protocol: https - -livenessProbe: - enabled: false -readinessProbe: - enabled: false -startupProbe: - enabled: false -