From e99fc3ab4434f0a983ee39c882bc4215101c1f59 Mon Sep 17 00:00:00 2001 From: Adrien Chauve Date: Fri, 13 Oct 2023 11:28:40 +0200 Subject: [PATCH] fix tests --- .../tests/__snapshots__/cnpg.dev.yaml | 33 ----- .../tests/__snapshots__/extends-ovh.dev.yaml | 70 ---------- .../tests/__snapshots__/extends-ovh.prod.yaml | 124 ------------------ .../override-env-default.dev.yaml | 35 ----- .../tests/__snapshots__/pg.dev.yaml | 35 ----- .../tests/__snapshots__/pg.prod.yaml | 62 --------- 6 files changed, 359 deletions(-) diff --git a/packages/kontinuous/tests/__snapshots__/cnpg.dev.yaml b/packages/kontinuous/tests/__snapshots__/cnpg.dev.yaml index e1f326de96..cccee0ee6e 100644 --- a/packages/kontinuous/tests/__snapshots__/cnpg.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/cnpg.dev.yaml @@ -303,38 +303,5 @@ spec: - CREATE EXTENSION IF NOT EXISTS \\"citext\\"; - CREATE EXTENSION IF NOT EXISTS \\"pgcrypto\\"; - CREATE EXTENSION IF NOT EXISTS \\"hstore\\"; ---- -apiVersion: postgresql.cnpg.io/v1 -kind: Pooler -metadata: - name: cnpg-cluster-rw - labels: - helm.sh/chart: cnpg-cluster-1.4.2 - app.kubernetes.io/name: cnpg-cluster - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: 14.5-6 - app.kubernetes.io/managed-by: Helm - kontinuous/deployment: test-cnpg-feature-branch-1-ffac537e6cbbf934b08745a378-5k18ynv8 - kontinuous/deployment.env: test-cnpg-feature-branch-1 - kontinuous/ref: feature-branch-1 - kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/resourceName: pooler-cnpg-cluster-rw-t5d0s6ee - app.kubernetes.io/manifest-managed-by: kontinuous - app.kubernetes.io/manifest-created-by: kontinuous - annotations: - kontinuous/chartPath: project.cnpg.cnpg-cluster - kontinuous/source: project/charts/cnpg/charts/cnpg-cluster/templates/pooler.cnpg.yaml - kontinuous/deployment: test-cnpg-feature-branch-1-ffac537e6cbbf934b08745a378-5k18ynv8 - namespace: test-cnpg-feature-branch-1 -spec: - cluster: - name: cnpg-cluster - instances: 1 - pgbouncer: - parameters: - max_client_conn: \\"1000\\" - poolMode: session - type: rw " `; diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml index 4c1f712b2b..1c063bb8dd 100644 --- a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml @@ -685,75 +685,5 @@ spec: - CREATE EXTENSION IF NOT EXISTS \\"citext\\"; - CREATE EXTENSION IF NOT EXISTS \\"pgcrypto\\"; - CREATE EXTENSION IF NOT EXISTS \\"hstore\\"; ---- -apiVersion: postgresql.cnpg.io/v1 -kind: Pooler -metadata: - name: pg-hasura-rw - labels: - helm.sh/chart: cnpg-cluster-1.9.12 - app.kubernetes.io/name: pg-hasura - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: \\"15\\" - app.kubernetes.io/managed-by: Helm - kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv - kontinuous/deployment.env: test-extends-ovh-feature-branch-1 - kontinuous/ref: feature-branch-1 - kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/resourceName: pooler-pg-hasura-rw-qzqjyuru - app.kubernetes.io/manifest-managed-by: kontinuous - app.kubernetes.io/manifest-created-by: kontinuous - annotations: - kontinuous/chartPath: project.fabrique.pg-hasura.cnpg-cluster - kontinuous/source: project/charts/fabrique/charts/pg-hasura/charts/cnpg-cluster/templates/pooler.cnpg.yaml - kontinuous/plugin.needs: | - - project.fabrique.pg-hasura.jobs-pg - kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv - namespace: test-extends-ovh-feature-branch-1 -spec: - cluster: - name: pg-hasura - instances: 1 - pgbouncer: - parameters: - max_client_conn: \\"1000\\" - poolMode: session - type: rw ---- -apiVersion: postgresql.cnpg.io/v1 -kind: Pooler -metadata: - name: pg-keycloak-rw - labels: - helm.sh/chart: cnpg-cluster-1.9.12 - app.kubernetes.io/name: pg-keycloak - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: \\"15\\" - app.kubernetes.io/managed-by: Helm - kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv - kontinuous/deployment.env: test-extends-ovh-feature-branch-1 - kontinuous/ref: feature-branch-1 - kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/resourceName: pooler-pg-keycloak-rw-ljgr35td - app.kubernetes.io/manifest-managed-by: kontinuous - app.kubernetes.io/manifest-created-by: kontinuous - annotations: - kontinuous/chartPath: project.fabrique.pg-keycloak.cnpg-cluster - kontinuous/source: project/charts/fabrique/charts/pg-keycloak/charts/cnpg-cluster/templates/pooler.cnpg.yaml - kontinuous/plugin.needs: | - - project.fabrique.pg-keycloak.jobs-pg - kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv - namespace: test-extends-ovh-feature-branch-1 -spec: - cluster: - name: pg-keycloak - instances: 1 - pgbouncer: - parameters: - max_client_conn: \\"1000\\" - poolMode: session - type: rw " `; diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml index 800e25d7e9..979e435dd8 100644 --- a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml @@ -883,130 +883,6 @@ spec: - CREATE EXTENSION IF NOT EXISTS \\"pgcrypto\\"; - CREATE EXTENSION IF NOT EXISTS \\"hstore\\"; --- -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: pg-hasura-rw - annotations: - kontinuous/chartPath: project.fabrique.pg-hasura.cnpg-cluster - kontinuous/source: project/charts/fabrique/charts/pg-hasura/charts/cnpg-cluster/templates/pooler.cnpg.yaml - kontinuous/plugin.needs: | - - project.fabrique.pg-hasura.jobs-pg - kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv - labels: - kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv - kontinuous/deployment.env: test-extends-ovh-prod - kontinuous/ref: feature-branch-1 - kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/resourceName: podmonitor-pg-hasura-rw-3z1pzpct - app.kubernetes.io/manifest-managed-by: kontinuous - app.kubernetes.io/manifest-created-by: kontinuous - namespace: test-extends-ovh -spec: - selector: - matchLabels: - cnpg.io/poolerName: pg-hasura-rw - podMetricsEndpoints: - - port: metrics ---- -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: pg-keycloak-rw - annotations: - kontinuous/chartPath: project.fabrique.pg-keycloak.cnpg-cluster - kontinuous/source: project/charts/fabrique/charts/pg-keycloak/charts/cnpg-cluster/templates/pooler.cnpg.yaml - kontinuous/plugin.needs: | - - project.fabrique.pg-keycloak.jobs-pg - kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv - labels: - kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv - kontinuous/deployment.env: test-extends-ovh-prod - kontinuous/ref: feature-branch-1 - kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/resourceName: podmonitor-pg-keycloak-rw-3n20ht4i - app.kubernetes.io/manifest-managed-by: kontinuous - app.kubernetes.io/manifest-created-by: kontinuous - namespace: test-extends-ovh -spec: - selector: - matchLabels: - cnpg.io/poolerName: pg-keycloak-rw - podMetricsEndpoints: - - port: metrics ---- -apiVersion: postgresql.cnpg.io/v1 -kind: Pooler -metadata: - name: pg-hasura-rw - labels: - helm.sh/chart: cnpg-cluster-1.9.12 - app.kubernetes.io/name: pg-hasura - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: \\"15\\" - app.kubernetes.io/managed-by: Helm - kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv - kontinuous/deployment.env: test-extends-ovh-prod - kontinuous/ref: feature-branch-1 - kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/resourceName: pooler-pg-hasura-rw-qzqjyuru - app.kubernetes.io/manifest-managed-by: kontinuous - app.kubernetes.io/manifest-created-by: kontinuous - annotations: - kontinuous/chartPath: project.fabrique.pg-hasura.cnpg-cluster - kontinuous/source: project/charts/fabrique/charts/pg-hasura/charts/cnpg-cluster/templates/pooler.cnpg.yaml - kontinuous/plugin.needs: | - - project.fabrique.pg-hasura.jobs-pg - kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv - namespace: test-extends-ovh -spec: - cluster: - name: pg-hasura - instances: 3 - pgbouncer: - parameters: - max_client_conn: \\"1000\\" - poolMode: session - type: rw ---- -apiVersion: postgresql.cnpg.io/v1 -kind: Pooler -metadata: - name: pg-keycloak-rw - labels: - helm.sh/chart: cnpg-cluster-1.9.12 - app.kubernetes.io/name: pg-keycloak - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: \\"15\\" - app.kubernetes.io/managed-by: Helm - kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv - kontinuous/deployment.env: test-extends-ovh-prod - kontinuous/ref: feature-branch-1 - kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/resourceName: pooler-pg-keycloak-rw-ljgr35td - app.kubernetes.io/manifest-managed-by: kontinuous - app.kubernetes.io/manifest-created-by: kontinuous - annotations: - kontinuous/chartPath: project.fabrique.pg-keycloak.cnpg-cluster - kontinuous/source: project/charts/fabrique/charts/pg-keycloak/charts/cnpg-cluster/templates/pooler.cnpg.yaml - kontinuous/plugin.needs: | - - project.fabrique.pg-keycloak.jobs-pg - kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv - namespace: test-extends-ovh -spec: - cluster: - name: pg-keycloak - instances: 3 - pgbouncer: - parameters: - max_client_conn: \\"1000\\" - poolMode: session - type: rw ---- apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: diff --git a/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml b/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml index 3895b1ca2a..371c8af6af 100644 --- a/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml @@ -394,41 +394,6 @@ spec: - CREATE EXTENSION IF NOT EXISTS \\"hstore\\"; --- apiVersion: postgresql.cnpg.io/v1 -kind: Pooler -metadata: - name: pg-rw - labels: - helm.sh/chart: cnpg-cluster-1.9.12 - app.kubernetes.io/name: pg - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: \\"15\\" - app.kubernetes.io/managed-by: Helm - kontinuous/deployment: test-override-env-default-feature-branch-1-ffac537e6c-tw0tuagy - kontinuous/deployment.env: test-override-env-default-feature-branch-1 - kontinuous/ref: feature-branch-1 - kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/resourceName: pooler-pg-rw-16g3zl77 - app.kubernetes.io/manifest-managed-by: kontinuous - app.kubernetes.io/manifest-created-by: kontinuous - annotations: - kontinuous/chartPath: project.fabrique.pg.cnpg-cluster - kontinuous/source: project/charts/fabrique/charts/pg/charts/cnpg-cluster/templates/pooler.cnpg.yaml - kontinuous/plugin.needs: | - - project.fabrique.pg.jobs-pg - kontinuous/deployment: test-override-env-default-feature-branch-1-ffac537e6c-tw0tuagy - namespace: test-override-env-default-feature-branch-1 -spec: - cluster: - name: pg - instances: 1 - pgbouncer: - parameters: - max_client_conn: \\"1000\\" - poolMode: session - type: rw ---- -apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: name: pg-scheduledbackup diff --git a/packages/kontinuous/tests/__snapshots__/pg.dev.yaml b/packages/kontinuous/tests/__snapshots__/pg.dev.yaml index e7b10f00ea..ff8bff4ae9 100644 --- a/packages/kontinuous/tests/__snapshots__/pg.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/pg.dev.yaml @@ -461,40 +461,5 @@ spec: - CREATE EXTENSION IF NOT EXISTS \\"citext\\"; - CREATE EXTENSION IF NOT EXISTS \\"pgcrypto\\"; - CREATE EXTENSION IF NOT EXISTS \\"hstore\\"; ---- -apiVersion: postgresql.cnpg.io/v1 -kind: Pooler -metadata: - name: cnpg-rw - labels: - helm.sh/chart: cnpg-cluster-1.9.10 - app.kubernetes.io/name: cnpg - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: \\"15\\" - app.kubernetes.io/managed-by: Helm - kontinuous/deployment: test-pg-feature-branch-1-ffac537e6cbbf934b08745a37893-4f12g0z3 - kontinuous/deployment.env: test-pg-feature-branch-1 - kontinuous/ref: feature-branch-1 - kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/resourceName: pooler-cnpg-rw-4k1jpapz - app.kubernetes.io/manifest-managed-by: kontinuous - app.kubernetes.io/manifest-created-by: kontinuous - annotations: - kontinuous/chartPath: project.fabrique.cnpg.cnpg-cluster - kontinuous/source: project/charts/fabrique/charts/cnpg/charts/cnpg-cluster/templates/pooler.cnpg.yaml - kontinuous/plugin.needs: | - - project.fabrique.cnpg.jobs-pg - kontinuous/deployment: test-pg-feature-branch-1-ffac537e6cbbf934b08745a37893-4f12g0z3 - namespace: test-pg-feature-branch-1 -spec: - cluster: - name: cnpg - instances: 1 - pgbouncer: - parameters: - max_client_conn: \\"1000\\" - poolMode: session - type: rw " `; diff --git a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml index 4bba4ee6e0..cbfcade3b5 100644 --- a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml @@ -557,68 +557,6 @@ spec: - CREATE EXTENSION IF NOT EXISTS \\"pgcrypto\\"; - CREATE EXTENSION IF NOT EXISTS \\"hstore\\"; --- -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: cnpg-rw - annotations: - kontinuous/chartPath: project.fabrique.cnpg.cnpg-cluster - kontinuous/source: project/charts/fabrique/charts/cnpg/charts/cnpg-cluster/templates/pooler.cnpg.yaml - kontinuous/plugin.needs: | - - project.fabrique.cnpg.jobs-pg - kontinuous/deployment: test-pg-feature-branch-1-ffac537e6cbbf934b08745a37893-4f12g0z3 - labels: - kontinuous/deployment: test-pg-feature-branch-1-ffac537e6cbbf934b08745a37893-4f12g0z3 - kontinuous/deployment.env: test-pg-prod - kontinuous/ref: feature-branch-1 - kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/resourceName: podmonitor-cnpg-rw-5q6ta7ib - app.kubernetes.io/manifest-managed-by: kontinuous - app.kubernetes.io/manifest-created-by: kontinuous - namespace: test-pg -spec: - selector: - matchLabels: - cnpg.io/poolerName: cnpg-rw - podMetricsEndpoints: - - port: metrics ---- -apiVersion: postgresql.cnpg.io/v1 -kind: Pooler -metadata: - name: cnpg-rw - labels: - helm.sh/chart: cnpg-cluster-1.9.12 - app.kubernetes.io/name: cnpg - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: \\"15\\" - app.kubernetes.io/managed-by: Helm - kontinuous/deployment: test-pg-feature-branch-1-ffac537e6cbbf934b08745a37893-4f12g0z3 - kontinuous/deployment.env: test-pg-prod - kontinuous/ref: feature-branch-1 - kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53 - kontinuous/resourceName: pooler-cnpg-rw-4k1jpapz - app.kubernetes.io/manifest-managed-by: kontinuous - app.kubernetes.io/manifest-created-by: kontinuous - annotations: - kontinuous/chartPath: project.fabrique.cnpg.cnpg-cluster - kontinuous/source: project/charts/fabrique/charts/cnpg/charts/cnpg-cluster/templates/pooler.cnpg.yaml - kontinuous/plugin.needs: | - - project.fabrique.cnpg.jobs-pg - kontinuous/deployment: test-pg-feature-branch-1-ffac537e6cbbf934b08745a37893-4f12g0z3 - namespace: test-pg -spec: - cluster: - name: cnpg - instances: 3 - pgbouncer: - parameters: - max_client_conn: \\"1000\\" - poolMode: session - type: rw ---- apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: