From 84e5be54c5a7a7cd086988f1e2e2e8347d6d8980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= Date: Tue, 13 Jun 2023 15:55:46 +0200 Subject: [PATCH] cleanup --- fruits-chart/Chart.yaml | 5 - fruits-chart/templates/database-operator.yaml | 29 ---- fruits-chart/templates/database-vm.yaml | 160 ------------------ fruits-chart/templates/deployment.yaml | 59 ------- fruits-chart/templates/route.yaml | 20 --- fruits-chart/templates/service.yaml | 23 --- fruits-chart/templates/servicebinding.yaml | 15 -- fruits-chart/values.yaml | 2 - 8 files changed, 313 deletions(-) delete mode 100644 fruits-chart/Chart.yaml delete mode 100644 fruits-chart/templates/database-operator.yaml delete mode 100644 fruits-chart/templates/database-vm.yaml delete mode 100644 fruits-chart/templates/deployment.yaml delete mode 100644 fruits-chart/templates/route.yaml delete mode 100644 fruits-chart/templates/service.yaml delete mode 100644 fruits-chart/templates/servicebinding.yaml delete mode 100644 fruits-chart/values.yaml diff --git a/fruits-chart/Chart.yaml b/fruits-chart/Chart.yaml deleted file mode 100644 index f8bc210..0000000 --- a/fruits-chart/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v2 -name: fruits-app -type: application -version: 0.0.1 -appVersion: "0.0.1" diff --git a/fruits-chart/templates/database-operator.yaml b/fruits-chart/templates/database-operator.yaml deleted file mode 100644 index 5284082..0000000 --- a/fruits-chart/templates/database-operator.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{ if eq .Values.db.deployment "operator" }} -apiVersion: postgres-operator.crunchydata.com/v1beta1 -kind: PostgresCluster -metadata: - name: hippo -spec: - image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.7-0 - postgresVersion: 14 - instances: - - name: instance1 - dataVolumeClaimSpec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: 1Gi - backups: - pgbackrest: - image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.41-4 - repos: - - name: repo1 - volume: - volumeClaimSpec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: 1Gi -{{ end }} diff --git a/fruits-chart/templates/database-vm.yaml b/fruits-chart/templates/database-vm.yaml deleted file mode 100644 index ddc01fb..0000000 --- a/fruits-chart/templates/database-vm.yaml +++ /dev/null @@ -1,160 +0,0 @@ -{{ if eq .Values.db.deployment "vm" }} -apiVersion: v1 -kind: Secret -metadata: - name: database-cloudinit -type: Opaque -stringData: - userData: | - #cloud-config - - users: - - name: nicolas - gecos: Nicolas MASSE - groups: wheel - lock_passwd: false - passwd: $6$XUTB20jVVXIqh78k$L1A9Lft5JlbOtNbeDP.fOZ5giLl09LfJGGCon5uwtsIhPJoNkj4SIk08Rb6vSowOps2ik5tlUwT2ZOZ6jjr7.0 - ssh_authorized_keys: - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPR1tt58X0+vbvsCR12gMAqr+g7vjt1Fx/qqz9EiboIs nicolas@localhost.localdomain - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFW62WJXI1ZCMfNA4w0dMpL0fsldhbEfULNGIUB0nQui nmasse@localhost.localdomain - - write_files: - - path: /etc/sudoers - content: | - Defaults !visiblepw - Defaults always_set_home - Defaults match_group_by_gid - Defaults always_query_group_plugin - Defaults env_reset - Defaults env_keep = "COLORS DISPLAY HOSTNAME HISTSIZE KDEDIR LS_COLORS" - Defaults env_keep += "MAIL QTDIR USERNAME LANG LC_ADDRESS LC_CTYPE" - Defaults env_keep += "LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES" - Defaults env_keep += "LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE" - Defaults env_keep += "LC_TIME LC_ALL LANGUAGE LINGUAS _XKB_CHARSET XAUTHORITY" - Defaults secure_path = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/var/lib/snapd/snap/bin - root ALL=(ALL) ALL - %wheel ALL=(ALL) NOPASSWD: ALL - #includedir /etc/sudoers.d - permissions: '0440' - append: false - - - path: /root/bootstrap.sh - content: | - #!/bin/bash - set -Eeuo pipefail - PGSETUP_INITDB_OPTIONS=--auth-host=scram-sha-256 postgresql-setup --initdb --unit postgresql - sed -i.bak -E "s/^#*\s*listen_addresses\s*=\s*'[^']*'/listen_addresses = '0.0.0.0'/" /var/lib/pgsql/data/postgresql.conf - cat >> /var/lib/pgsql/data/pg_hba.conf <