diff --git a/deploy-k8s.sh b/deploy-k8s.sh index 81b5e83..32b0888 100755 --- a/deploy-k8s.sh +++ b/deploy-k8s.sh @@ -25,15 +25,6 @@ else echo 'did not find existing db credentials, creating new' fi -if kubectl --namespace glvd get secret | grep -q pgadmin-credentials ; then - PGADMIN_PASSWORD=$(kubectl --namespace glvd get secret/pgadmin-credentials --template="{{.data.password}}" | base64 -d) - echo 'found existing pgadmin credentials, re-using' -else - PGADMIN_PASSWORD=$(pwgen 42 1) - kubectl --namespace glvd create secret generic pgadmin-credentials --type=string --from-literal=password="$PGADMIN_PASSWORD" - echo 'did not find existing pgadmin credentials, creating new' -fi - kubectl --namespace glvd apply -f deployment/k8s/00_db-statefulset.yaml echo 'give db some time to pull image and start' diff --git a/deployment/k8s/03_pgadmin.yaml b/deployment/k8s/03_pgadmin.yaml deleted file mode 100644 index 92c90c7..0000000 --- a/deployment/k8s/03_pgadmin.yaml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: pgadmin - namespace: glvd -spec: - replicas: 1 - selector: - matchLabels: - app: pgadmin - template: - metadata: - labels: - app: pgadmin - spec: - containers: - - env: - - name: PGADMIN_DEFAULT_EMAIL - value: glvd@gardenlinux.io - - name: PGADMIN_DEFAULT_PASSWORD - valueFrom: - secretKeyRef: - name: pgadmin-credentials - key: password - - name: PGADMIN_PORT - value: "80" - image: dpage/pgadmin4:9.9.0 - imagePullPolicy: IfNotPresent - name: pgadmin - ports: - - containerPort: 80 - resources: - limits: - memory: 4096Mi ---- -apiVersion: v1 -kind: Service -metadata: - name: pgadmin - namespace: glvd -spec: - ports: - - port: 80 - protocol: TCP - targetPort: 80 - selector: - app: pgadmin - type: LoadBalancer diff --git a/deployment/k8s/04_gardener-ingress-dev.yaml b/deployment/k8s/04_gardener-ingress-dev.yaml deleted file mode 100644 index c599bb6..0000000 --- a/deployment/k8s/04_gardener-ingress-dev.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - cert.gardener.cloud/purpose: managed - dns.gardener.cloud/class: garden - dns.gardener.cloud/dnsnames: security.dev.gardenlinux.org - dns.gardener.cloud/ip-stack: dual-stack - dns.gardener.cloud/ttl: "300" - name: glvd - namespace: glvd -spec: - ingressClassName: nginx - rules: - - host: security.dev.gardenlinux.org - http: - paths: - - backend: - service: - name: glvd - port: - number: 8080 - path: / - pathType: Prefix - tls: - - hosts: - - security.dev.gardenlinux.org - secretName: security-dev-gl-org diff --git a/deployment/k8s/04_gardener-ingress-live.yaml b/deployment/k8s/04_gardener-ingress-live.yaml deleted file mode 100644 index f2d92ef..0000000 --- a/deployment/k8s/04_gardener-ingress-live.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - cert.gardener.cloud/purpose: managed - dns.gardener.cloud/class: garden - dns.gardener.cloud/dnsnames: security.gardenlinux.org - dns.gardener.cloud/ip-stack: dual-stack - dns.gardener.cloud/ttl: "300" - name: glvd - namespace: glvd -spec: - ingressClassName: nginx - rules: - - host: security.gardenlinux.org - http: - paths: - - backend: - service: - name: glvd - port: - number: 8080 - path: / - pathType: Prefix - tls: - - hosts: - - security.gardenlinux.org - secretName: security-gl-org