Merge branch 'revert-b25eff86' into 'database-operators'

Revert "add denbi cluster customizations"

See merge request !7

specific-databases/fleet.yaml

@@ -35,9 +35,3 @@ targetCustomizations:
       name: jupyter-prod
   kustomize:
     dir: overlays/jupyter-prod
\ No newline at end of file
-- name: jupyter-denbi
-  clusterSelector:
-    matchLabels:
-      name: jupyter-denbi
-  kustomize:
-    dir: overlays/jupyter-denbi
\ No newline at end of file

specific-databases/overlays/jupyter-denbi/kustomization.yaml

-resources:
-- postgresql.yaml
\ No newline at end of file

specific-databases/overlays/jupyter-denbi/postgresql.yaml

-apiVersion: "acid.zalan.do/v1"
-kind: "postgresql"
-metadata:
-  name: "postgresql"
-  namespace: "database"
-  labels:
-    team: jupyter
-spec:
-  teamId: "jupyter"
-  postgresql:
-    version: "16"
-  numberOfInstances: 1
-  enableConnectionPooler: true
-  volume:
-    size: "8Gi"
-    selector:
-      matchLabels:
-        postgres-volume: "true"
-  users:
-    cattle-monitoring-system.grafana: []
-    outpost.kubeoutpost: []
-  databases:
-    # database : owner
-    grafana: cattle-monitoring-system.grafana
-    kubeoutpost: outpost.kubeoutpost
-  allowedSourceRanges:
-    # IP ranges to access your cluster go here
-  resources:
-    requests:
-      cpu: 100m
-      memory: 500Mi
-    limits:
-      cpu: 2000m
-      memory: 400Mi
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-        - matchExpressions:
-            - key: worker
-              operator: In
-              values:
-                - "true"
-  patroni:
-    pg_hba:
-      - local all all trust
-      - hostssl all +zalandos 127.0.0.1/32 pam
-      - host all all 127.0.0.1/32 md5
-      - hostssl all +zalandos ::1/128 pam
-      - host all all ::1/128 md5
-      - local replication standby trust
-      - hostssl replication standby all md5
-      - hostnossl all all 10.42.0.0/16 md5
-      - hostnossl all all all reject
-      - hostssl all +zalandos all pam
-      - hostssl all all all md5

specific-namespaces/fleet.yaml

@@ -17,9 +17,3 @@ targetCustomizations:
       name: jupyter-prod
   kustomize:
     dir: overlays/jupyter-prod
-- name: jupyter-denbi
-  clusterSelector:
-    matchLabels:
-      name: jupyter-denbi
-  kustomize:
-    dir: overlays/jupyter-denbi
\ No newline at end of file

specific-namespaces/overlays/jupyter-denbi/kustomization.yaml

-resources:
-- namespaces.yaml
\ No newline at end of file

specific-namespaces/overlays/jupyter-denbi/namespaces.yaml

-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    meta.helm.sh/release-namespace: database
-    meta.helm.sh/release-name: postgres-operator-specific-namespaces
-  labels:
-    app.kubernetes.io/managed-by: Helm
-    kubernetes.io/metadata.name: cattle-monitoring-system
-    name: cattle-monitoring-system
-  name: cattle-monitoring-system
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    meta.helm.sh/release-namespace: database
-    meta.helm.sh/release-name: postgres-operator-specific-namespaces
-  labels:
-    app.kubernetes.io/managed-by: Helm
-    kubernetes.io/metadata.name: outpost
-    name: outpost
-  name: outpost

specific-secrets/fleet.yaml

@@ -30,9 +30,3 @@ targetCustomizations:
       name: jupyter-prod
   kustomize:
     dir: overlays/jupyter-prod
\ No newline at end of file
-- name: jupyter-denbi
-  clusterSelector:
-    matchLabels:
-      name: jupyter-denbi
-  kustomize:
-    dir: overlays/jupyter-denbi
\ No newline at end of file

specific-secrets/overlays/jupyter-denbi/jobs.yaml

-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: wait-for-secret-postgres
-  namespace: database
-spec:
-  template:
-    spec:
-      containers:
-      - name: main
-        image: busybox
-        command: ['sh', '-c', 'echo "secret created"']
-        env:
-        - name: username
-          valueFrom:
-            secretKeyRef:
-              name: postgres.postgresql.credentials.postgresql.acid.zalan.do
-              key: username
-      restartPolicy: Never
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: wait-for-secret-standby
-  namespace: database
-spec:
-  template:
-    spec:
-      containers:
-      - name: main
-        image: busybox
-        command: ['sh', '-c', 'echo "secret created"']
-        env:
-        - name: username
-          valueFrom:
-            secretKeyRef:
-              name: standby.postgresql.credentials.postgresql.acid.zalan.do
-              key: username
-      restartPolicy: Never
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: wait-for-secret
-  namespace: cattle-monitoring-system
-spec:
-  template:
-    spec:
-      containers:
-      - name: main
-        image: busybox
-        command: ['sh', '-c', 'echo "secret created"']
-        env:
-        - name: username
-          valueFrom:
-            secretKeyRef:
-              name: cattle-monitoring-system.grafana.postgresql.credentials.postgresql.acid.zalan.do
-              key: username
-      restartPolicy: Never
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: wait-for-secret
-  namespace: outpost
-spec:
-  template:
-    spec:
-      containers:
-      - name: main
-        image: busybox
-        command: ['sh', '-c', 'echo "secret created"']
-        env:
-        - name: username
-          valueFrom:
-            secretKeyRef:
-              name: outpost.kubeoutpost.postgresql.credentials.postgresql.acid.zalan.do
-              key: username
-      restartPolicy: Never
\ No newline at end of file

specific-secrets/overlays/jupyter-denbi/kustomization.yaml

-resources:
-- secrets.yaml
-- jobs.yaml

specific-secrets/overlays/jupyter-denbi/secrets.yaml

----
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: postgres.postgresql.credentials.postgresql.acid.zalan.do
-  namespace: database
-spec:
-  encryptedData:
-    password: AgBqycAlT56dyqMo8kuF+CQT3kpbMFFSCNWr92yUxq/GH5VdhFBcxC01WTt0JhqhlRcngwn0mtYXltXn0COEpjF1kmMPDH8xIRIPyrFSVMVplYmm4q7ihkyoXaRRNaZyN+icbAyOk7vmOs8YKslqA+G2Vjx5HL2/HXW+wcy9aNunt8pwZmSu88N10/KvsWiyDXR3/xkt0avInSAhvxC6gJ5OH5gM43Z5pxEaGSDxb0xOcP0I5/uuCDdyXbzhNxnWJVLPEBt14S0AOLU1ZxIvV4HEGXKymFM3Iftgujeq9NxqELxXnS9vzdWeIwLesazLJy1QPJ+IaoiZ5eieAhjZMYcFq90z8h6K58NrSth/WWksFEkGOpk7BWs3MKuPJOEIh3p5u50eCPDC3fFap3DIpEt3efGmyJvy+9tdbM3NBtYCJY8WUwbi+8FFLJcGcZvFtDgUK8xNdYbTNfl3GfJcQuO5M6xYPpO2LU2n/YtMaHJRAipRAHAV/QGbCdjfSC6JF4v6K9KfjATELHMwhuHHXaUSDdhVgb0eawqOjimsTgMXApDYCkU4VqlEPlai+WJ87nIHms/SATxm7ex0o7mYSaUTUtZbLLw04yuPO0h/QGQxv/NY8GoBJLmrhM/pkeZaypimGmvXpDDQcRdoI9SQCfLDxLu7oXJ+M7QWIhsQt+qFSULKSBn1TQDjSIHyUMCM1v9bdajh6ZQKtid1aXs5Bc6UuZ0GYtH8K8BCQCt0rKeOBHGZUFsOHrcX5QgUKrzb0fx0d3HzvJeNMStK2JHaQtez
-    username: AgCpyvRn9QaOJdFNSFMHIEtT1ip1rjnXXqxj8D3oAj8cBnNtAxRkADwDsQ6Gjpyh7NU/WQkeECH179KeQDtgdqPMfpOf9iNcYyibx+T19OOXnEqlThrCpuH5toB11kJWw+4bB+IwcswrXL5FfT6J3XRp6NGH87Oi+vec4ucoR7030Ei1pUxE+wAvpUdwL5jJKAvHOoePqRyybEpYQuBXZD5sEfoDNWwjZ/zlE5QY//MhnSrhRpig4dvUe74rRDfi491v5E1Y9z1dQJFOrbMvFZCJ5fGAQgnKhRP1fj1ExXF91lgERx+5iWLcP82eJo8yUQ0sTudJ1xRi85Bq2RpGebRyGoPtdq8LnDsjVOWD/xC1zsfj52fUpkaslhAb+DBhKlgapfm9d5eaRm26loNnhLgXBschm+Fh7ehz/G45xmz48Cmk/2sfJL5dQvtaI89NW0reng6hiOEmlBKEmqCfobpni18bfTmKCDcn4lzIxC8nRwaSJCNii8DK1rqr7F+6jL85VT0faE2P3MzanyXSzvJqJcmBdtsOOruHOMyDS1nQEtL8MZjFNcmAhYrs029pC9RZA/K6HjTNeAb48phf/vIHYqhTd3pYtopBkyCHqjWV8Q2zwipIKifZLIk7rE+5Ewh04qvky6dOV5ovPW8aae5L8Bw6MHTX2P7rrpRM2zYhawRC83ncP/xO5M2kOIgH2h7rp3mdmRn5OA==
-  template:
-    metadata:
-      creationTimestamp: null
-      labels:
-        application: spilo
-        cluster-name: postgresql
-        team: jupyter
-      name: postgres.postgresql.credentials.postgresql.acid.zalan.do
-      namespace: database
-    type: Opaque
----
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: standby.postgresql.credentials.postgresql.acid.zalan.do
-  namespace: database
-spec:
-  encryptedData:
-    password: AgBYQjU6qnvg9Y2vpEhgUz1man+mIk3mmuJNyCBkCgvTetZGa4pzxsviArBS4CagnW57HAh9XVfhgDzzd8BCUmjyjoO2rBxUwc/cyw9rYD/Mwa0J3GS8TWKCxTWUxs+oLFoAJW4qSSabQhuT8xkjboSFjmRew89Q3rj1xltQNcJr+Gr9Y6EN0cy+r28wtC9W8eWuC3PRzJSszTnnhCUanCA7Pnz8SCvxeuWK+LV/V65jUyZHzMq8Xt7BDPBd/QJtvk5vZyCzJLbOdeS2K3+YYYy1Lc11mcxAfhtXZX8ETI3U6I7zQ1BuuVqHGEubBwteNG8ksq7NS+wgtXgsnytzm7fADVvRsEMgJzz6TsuAZdTNNKe+d5cfu/wZfiZs/vb1PO8yGjz+uT75q3kVF5Iu1ypuOYHLx8/krUHNqnJ1ggfzf8YLbtgVVpluS4G2O8NI1Oxnf3seE8zTUD128hQXW99ErNM7GGITyt1jLpyeHHOMs8EnStiNDTuxN19DVue8EKAwl9dL95SjYt6f3CH1XaqseX6u5GWjfNIvjpBWo9TxiPtt+9cvkuevMooShhYiS5LP6SbYxlurF8LFLYSWzChqoqfkkjEpFMD59pSEY4DPU9sruK2IXOei+XrXzRRMmcDk2LeJi0KycODbb0wXHb5at4h+rjcng5oGmpQSkjRYVOfr+O6dVbyHBw59++h/0d33HYDbkiEUPs1M1jcIrvp2oKDT7NHlIzRO438u3K3FSt+jt4uIiX4jRGf4wHaGMTVIhxovefuX7yd5eTuKmVrh
-    username: AgDjIydDpdEVh2XTAm0z1O9mh0RaQ45eAFaPLH5wul8TcciAxdlmsv2sdEXm0O9Pn27NtBNcpwEtfCm3iU7QsPwTMscD5F1MZrpMWYU1E0U1G2fXGmkh+etNjElw+mTDyI2p9jhP9fqsFdARzGxH2znB+XX3tUgIwHjhBIwKG0ESIIDg1VQBb1Zu0CE5POYHgQzoaOpYipUT8oUFp0vo9l4duowu6F5YSPrlabCn+vuVZdRwpN8f0xPFlXzEYq/QXwaeLWOAbVdXE0aKKbhLhEBUifpMAYp3FK9UCUKmgvthcsGf3dlfWMbUdIG/WJixsLZCDl9LzU1RmFEQJXvaD90sbu/f/Oo78fL50C9QwXknT311FSH8CSiOIY61GHl6WG6Nbc/h75pzzOgjC+E/Yv0EjMbAF8zKh89wywSKy8+QpCfuMAKhTTKjRPDVdtL0ZAIwICymUhFfkvPOXpu8E0Y+F4zS92v7V6uL9jmMzbf/MXZzn/XDVw297y8yVmceSe/qh8bO9yl+leZh54p2l0AmZQbqnU+KOsg9FNYHmobLTVN0VRbsD/l/Jq5kiu7pRnIbIxtj4t3lVy2tiBAsLIRTUi6f3EveaMpVvEMVZ4ujOzSJnqJsrwF14Nn1bIwBaaAnFnhKCpc/SJqFGZprH8ECO+TkHHGKxisT6qfjv7NBQC1ucyVqkjMwfKyZUKGLWnU8ojMuAG9j
-  template:
-    metadata:
-      creationTimestamp: null
-      labels:
-        application: spilo
-        cluster-name: postgresql
-        team: jupyter
-      name: standby.postgresql.credentials.postgresql.acid.zalan.do
-      namespace: database
-    type: Opaque
----
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: cattle-monitoring-system.grafana.postgresql.credentials.postgresql.acid.zalan.do
-  namespace: cattle-monitoring-system
-spec:
-  encryptedData:
-    password: AgCDxzrBe0yRw5nLcfdI4DfZgmY1acigyrjM7CJhYu8cMVCBuiMTUmfeDVm+fVf8487VNKnwDOW+Mof9sCcpI4typKSShr9sf3Ty2myVirkJh2P1ELMEsWVAdiN97nSdLpOgUeMIn58fvJbknv0a3llHCeVI+Cr7N7vxUn6+YUY/Z3rMrRN5AtDGDW3x1tihw4z2YLfhiXRmwjj1c4gy+gm9GazHqROfpOQkDIA6hC2lNxUWVP6oHMfdvrDwMxDEWEbgtkrXbtbYWoL+iA2hNxEA1ex5Rcc3J3OvWBPSJ3IuZxkI0CqnGn472vXPSo7inZcofRSEMJUmt2RTrzbGIeFjNGjTt0l1hcgK9MGJTnwqOP6OPlN63WQ6Sv9PtZ22g4/LPKyPLqjp5pqYbTZxbimbOHH6UTZx+O5KynaAxBzoZebQxgdH/Ru77qXguJeI1cIR+Z2e0lQC5FqcwMHb7cRmmElsFmymsbF14LhxsnKKRFXWcBUwfb8NBYFXMTK4lar2P/WMGS1o3wxm8EEAGMP7cllmSSnoSR0FV4/oRhJx0lyTgO4YM/h+Hi/2FckZwP1n6byQupFSP/wB8CxIQSLOje1iXS7FW8kwMQ6JCSFP6lAXgOrPIZQ4abuPJQY7oSRzZwZDMxjQLQsp7Ax5DUTHD+JFned4+9ZZZgqV2Sn2CcJU/mq61EXNQaKTBoz//NxIcjYdYNUv0Iu7LlWSM/kvI692eEbsPkQ+mwBRl4RH232pgRdaP5zcn43uiyUyZvGRkPtmb4fQ7i6OnrTADvT0
-    username: AgCaXg+zsXny9uEBca+MIlSu3f/Po7bG2ovkffd8vdOao+IKhaWuPa/05ImxMVF0BAwO0MtJFxkxIRU5jA2zQMp0HSxzRiwmv3PVHYXSRhrzPufzK3yD5LSdB7Ja+Mii6UJynezF2jg/HwsdQC9lo8CgnxNbqdNz2Xwt8bbFjE8T9jFdo9wz3Mv70zlFdGbQCX2CUd3E0aPCoYHoBzD7mM5kf5YoJwkqpltJ+sC+izPdo/8DZ/a65BqTBAa3ko3C8xoeYMQTw/GBjrbNcIJhqxQgzDTLtWEm+Kx/FnuqHvrzfeaGiqKbyo2y/Yo318nO6dcht+v5Ko9RdZ0dU9lbUB0N5zChqZexGOl7VfTxHjhnCuqiS1mfoHxdG7taMSBioRnNg55ApX87R2vAJ+a+MxhfM1YwlD4nzw2e40amLHsghVBovgsJ8cY+1wAPKS1c8sQW83MPKQfCVxSrTlpj45AACL9LnIrSuAOQHa4EGU1xw1g8xdU9mzQPuVMJMQgEGbBIfOiMw5wK8ZLAlG9qyHQTvqxMpgTJ5X3U50y8fXPYZ/Nsv4mwD0beRQhWZ+sH5PcEKcOTgp+Uhw5pyaNOTUHrKnwZutt2KTsNkHtmTvzx4Fu6P/X836eOjlCxfkqFEoD7qEVz9e9pYHQE1J0nkz+Ie6fxCRPOxkIIqS1q+t/CrYHjV75eRyMX1zJldLHjV69LRZdZTXv251Ic4QjyhX8Du91b/GyOsygs+AmCUwTs7g==
-  template:
-    metadata:
-      creationTimestamp: null
-      labels:
-        application: spilo
-        cluster-name: postgresql
-        team: jupyter
-      name: cattle-monitoring-system.grafana.postgresql.credentials.postgresql.acid.zalan.do
-      namespace: cattle-monitoring-system
-    type: Opaque
----
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: outpost.kubeoutpost.postgresql.credentials.postgresql.acid.zalan.do
-  namespace: outpost
-spec:
-  encryptedData:
-    password: AgAMTSo2Z5bIq0d1cZgCsUInimrCyONdZ0b1wowaNz2f2et9iV9vaaIDB3jbGK4oEy764a+FSgljGXYhIeg0lodk7psiaT0AgdLcL9pyw58ZydA9hPx25APVZtc6KjXx5434c0dhHpO6kM7sRY+kEdCVbndRc0yU/TWG3gOhkGuwK3c2fk3O+n6hYWucDqsTMnA/81DNEvxHk4CWSLWqG361r0k5NubiS1z7Mena7nbKkmMJhl0QeLd7T8b+dXO8l+ZvwyQ3QAAIpd4KtsfwxCA2esv9reDKpBrSXBojvA7FSnQ0++Z//B4Ci7ojlorWxOE7O/oSVazh9g7ErdurjPkUnh+xIfpAtTaVqohc2uyW36U+vUNQkbIab+86EChGyUx+5z58aM/rQB3XZvz7fuHqs67M1mH9Pn/KZGNUQuGkDSB2FakpyBz7QtjhD1PH4GE38dtsrXhhEUrsYNwfHR6RwDFGbbZYFjgmmPF43DYg149taBCBGHToEMWHsdNHrfo+nATcOpIlu80eZkG/XMvjuR6+8exYjjmhX9Dx0/ltTLv0oGjtLSCesN72bEcVxe+PlQ51M7EvBMgy73KflqJnQIh39Bu4anep1x2VC4XNKCG89tUWbIVchXSsq5pXiIXHZdrZB96e9+sfkwnnNV5vti90I+MbyuHZj4CungqpbRc2glGULOq387kUBWdAeUP+asIrC4f9y7G7GdEiRbpVpPEb8o8pKpn5Oe9TBsSSM2/pmV1asfiUIS06WLthFRQhWS6eZ2RYnuTGPLlc7zbD
-    username: AgA+kelQzvzIjiVucpS7xvXjKX24B/lPjIAZbdgZzkMeb/T4daQCHYXXcXaM0nB7kli7+9967WY8uJvNQ/+mHXNj/AiOvbM+ZpYdDxSSYnISmMB8G660OyDnYcPROP9vBxHqIwzMKvBrI2CfPIskPxocGkGRBDp7s0/kxtdcNouP7CfHifCONpFHlTeBYFLXsoZTaAnORE3vS2OrTrs26b75m09OOt/OwmKjHtRR67X0DnCJQ8YznF4RFBBowxr0lhcaimbornuCUvtZm4tcPhvF4msTnXZ/WwqvAc0AlT684TPNNFV2Gyw986Kx3waBB1AqdukxzHMLFjV++CnCyNrXJX0O7M9t0G+gCCVmAQ8earRVjg0M910Jpmxc4fNi7967w8muVOzboZXNDBqeJGI1CBRzOj7PQFdmEISQNLOmw9niczplc4xFn8WuP8nZ1AiEMeeB1cq8Qv+yD+umbvTTYMZlggUZAaL7vjqhdc2lmMnnbW+hpJdUmlJvlOYPeVbYhAg+d80GoVVFpbSYb55t3/7RekiKhK8rfUzPaK73obL2cvtcoTW5bbEmjl99A0s+z5cg0lRt7ODlZDVQZT3q1D3pve/4KRuw+rXFMe0/rQ/whcAN69jbwL+O8r6pFNZrk0d0Vm/d6qqImtTO5l53LS32/Wzc7g+cg0EkemVVsjqKUYKsDYFduYnreWuF7lSPO7gJ0F1G5M8wi5QSgwIYHhSN
-  template:
-    metadata:
-      creationTimestamp: null
-      labels:
-        application: spilo
-        cluster-name: postgresql
-        team: jupyter
-      name: outpost.kubeoutpost.postgresql.credentials.postgresql.acid.zalan.do
-      namespace: outpost
-    type: Opaque

specific-volumes/fleet.yaml

@@ -23,9 +23,3 @@ targetCustomizations:
       name: jupyter-prod
   kustomize:
     dir: overlays/jupyter-prod
\ No newline at end of file
-- name: jupyter-denbi
-  clusterSelector:
-    matchLabels:
-      name: jupyter-denbi
-  kustomize:
-    dir: overlays/jupyter-denbi
\ No newline at end of file

specific-volumes/overlays/jupyter-denbi/kustomization.yaml

-resources:
-- pv.yaml
\ No newline at end of file

specific-volumes/overlays/jupyter-denbi/pv.yaml

-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  labels:
-    postgres-volume: "true"
-  name: postgres
-spec:
-  accessModes:
-    - ReadWriteOnce
-  capacity:
-    storage: 8Gi
-  csi:
-    driver: cinder.csi.openstack.org
-    volumeHandle: ef52695e-2441-434a-8e39-99a3b2f8cb1c
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-        - matchExpressions:
-            - key: topology.cinder.csi.openstack.org/zone
-              operator: In
-              values:
-                - nova
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: csi-cinder-sc-retain
-  volumeMode: Filesystem