diff --git a/.github/workflows/common_library_tests.yaml b/.github/workflows/common_library_tests.yaml index 492a2dce..ff26d93a 100644 --- a/.github/workflows/common_library_tests.yaml +++ b/.github/workflows/common_library_tests.yaml @@ -206,7 +206,7 @@ jobs: - name: Add Dependencies run: | - if [[ "${{ matrix.values }}" =~ (metrics|cnpg).*-values.yaml ]]; then + if [[ "${{ matrix.values }}" =~ (ingress|metrics|cnpg).*-values.yaml ]]; then helm install prometheus-operator oci://tccr.io/truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait fi if [[ "${{ matrix.values }}" =~ cnpg.*-values.yaml ]]; then @@ -227,7 +227,7 @@ jobs: mv -f library/common-test/runtests/${{ matrix.values }} library/common-test/values.yaml # Stat kail on the background to grab logs from tests - ./kail --ignore-ns kube-system --ignore-ns cert-manager --ignore-ns metallb-system --ignore-ns prometheus-operator >> /tmp/output.log & + ./kail --ignore-ns kube-system --ignore-ns cert-manager --ignore-ns metallb-system --ignore-ns prometheus-operator >> /tmp/output.log & # Actually run the test ct install --config .github/ct-install-config/ct-install.yaml \ diff --git a/library/common-test/ci/autopermissions-values.yaml b/library/common-test/ci/autopermissions-values.yaml index fed24c3a..7aa1aa52 100644 --- a/library/common-test/ci/autopermissions-values.yaml +++ b/library/common-test/ci/autopermissions-values.yaml @@ -46,6 +46,3 @@ persistence: hostPath: /usr mountPath: /hptest hostPathType: "" - -manifestManager: - enabled: false diff --git a/library/common-test/ci/backupstoragelocation-values.yaml b/library/common-test/ci/backupstoragelocation-values.yaml index b5e8b6bc..fbb460bb 100644 --- a/library/common-test/ci/backupstoragelocation-values.yaml +++ b/library/common-test/ci/backupstoragelocation-values.yaml @@ -36,9 +36,6 @@ workload: type: http port: "{{ .Values.service.main.ports.main.port }}" -manifestManager: - enabled: false - # Parameters for the BackupStorageLocation(s). Configure multiple by adding other element(s) to the backupStorageLocation slice. # See https://velero.io/docs/v1.6/api-types/backupstoragelocation/ backupStorageLocation: diff --git a/library/common-test/ci/basic-values.yaml b/library/common-test/ci/basic-values.yaml index f5b0ee6f..d7fe2666 100644 --- a/library/common-test/ci/basic-values.yaml +++ b/library/common-test/ci/basic-values.yaml @@ -35,6 +35,3 @@ workload: enabled: true type: http port: "{{ .Values.service.main.ports.main.port }}" - -manifestManager: - enabled: false diff --git a/library/common-test/ci/clickhouse-values.yaml b/library/common-test/ci/clickhouse-values.yaml index ed8f0008..c9621243 100644 --- a/library/common-test/ci/clickhouse-values.yaml +++ b/library/common-test/ci/clickhouse-values.yaml @@ -24,8 +24,5 @@ workload: startup: enabled: true -manifestManager: - enabled: false - clickhouse: enabled: true diff --git a/library/common-test/ci/cnpg-multi-values.yaml b/library/common-test/ci/cnpg-multi-values.yaml index 63112c0c..e693e603 100644 --- a/library/common-test/ci/cnpg-multi-values.yaml +++ b/library/common-test/ci/cnpg-multi-values.yaml @@ -24,10 +24,6 @@ workload: startup: enabled: true -manifestManager: - enabled: true - staging: true - cnpg: main: enabled: true diff --git a/library/common-test/ci/cnpg-values.yaml b/library/common-test/ci/cnpg-values.yaml index 82099537..3ef3c646 100644 --- a/library/common-test/ci/cnpg-values.yaml +++ b/library/common-test/ci/cnpg-values.yaml @@ -24,10 +24,6 @@ workload: startup: enabled: true -manifestManager: - enabled: true - staging: true - cnpg: main: enabled: true diff --git a/library/common-test/ci/codeserver-values.yaml b/library/common-test/ci/codeserver-values.yaml index 8087734e..6241ab64 100644 --- a/library/common-test/ci/codeserver-values.yaml +++ b/library/common-test/ci/codeserver-values.yaml @@ -47,10 +47,6 @@ persistence: type: pvc mountPath: /testpvc -manifestManager: - enabled: false - staging: false - addons: codeserver: enabled: true diff --git a/library/common-test/ci/configmap-values.yaml b/library/common-test/ci/configmap-values.yaml index a0c9b904..8c770183 100644 --- a/library/common-test/ci/configmap-values.yaml +++ b/library/common-test/ci/configmap-values.yaml @@ -70,6 +70,3 @@ configmap: "key3": "value2" } } - -manifestManager: - enabled: false diff --git a/library/common-test/ci/cron-values.yaml b/library/common-test/ci/cron-values.yaml index 19cb6ecc..b793b87f 100644 --- a/library/common-test/ci/cron-values.yaml +++ b/library/common-test/ci/cron-values.yaml @@ -37,6 +37,3 @@ workload: enabled: true type: http port: "{{ .Values.service.main.ports.main.port }}" - -manifestManager: - enabled: false diff --git a/library/common-test/ci/daemonset-values.yaml b/library/common-test/ci/daemonset-values.yaml index fbff3ae9..4be16579 100644 --- a/library/common-test/ci/daemonset-values.yaml +++ b/library/common-test/ci/daemonset-values.yaml @@ -35,6 +35,3 @@ workload: enabled: true type: http port: "{{ .Values.service.main.ports.main.port }}" - -manifestManager: - enabled: false diff --git a/library/common-test/ci/extra-containers-values.yaml b/library/common-test/ci/extra-containers-values.yaml index 1aa69542..1569b5a8 100644 --- a/library/common-test/ci/extra-containers-values.yaml +++ b/library/common-test/ci/extra-containers-values.yaml @@ -47,6 +47,3 @@ additionalContainers: port: 8081 type: http path: / - -manifestManager: - enabled: false diff --git a/library/common-test/ci/imagePullSecret-values.yaml b/library/common-test/ci/imagePullSecret-values.yaml index f2cae19c..6a994da9 100644 --- a/library/common-test/ci/imagePullSecret-values.yaml +++ b/library/common-test/ci/imagePullSecret-values.yaml @@ -51,6 +51,3 @@ imagePullSecret: username: "{{ .Values.user }}" password: "{{ .Values.pass }}" email: "{{ .Values.email }}" - -manifestManager: - enabled: false diff --git a/library/common-test/ci/ingress-values.yaml b/library/common-test/ci/ingress-values.yaml index af96ed6e..640c4ec3 100644 --- a/library/common-test/ci/ingress-values.yaml +++ b/library/common-test/ci/ingress-values.yaml @@ -37,10 +37,6 @@ service: protocol: http port: 8081 -manifestManager: - enabled: false - staging: false - # -- Configure the ingresses for the chart here. # Additional ingresses can be added by adding a dictionary key similar to the 'main' ingress. # @default -- See below diff --git a/library/common-test/ci/init-values.yaml b/library/common-test/ci/init-values.yaml index 4ecd2a4b..6745f347 100644 --- a/library/common-test/ci/init-values.yaml +++ b/library/common-test/ci/init-values.yaml @@ -50,6 +50,3 @@ service: primary: true protocol: http port: 8080 - -manifestManager: - enabled: false diff --git a/library/common-test/ci/job-values.yaml b/library/common-test/ci/job-values.yaml index 50ec1472..41288317 100644 --- a/library/common-test/ci/job-values.yaml +++ b/library/common-test/ci/job-values.yaml @@ -36,6 +36,3 @@ workload: enabled: true type: http port: "{{ .Values.service.main.ports.main.port }}" - -manifestManager: - enabled: false diff --git a/library/common-test/ci/mariadb-values.yaml b/library/common-test/ci/mariadb-values.yaml index 2ecffed9..65b6c95c 100644 --- a/library/common-test/ci/mariadb-values.yaml +++ b/library/common-test/ci/mariadb-values.yaml @@ -24,8 +24,5 @@ workload: startup: enabled: true -manifestManager: - enabled: false - mariadb: enabled: true diff --git a/library/common-test/ci/metrics-values.yaml b/library/common-test/ci/metrics-values.yaml index 72773fa6..f615c5e5 100644 --- a/library/common-test/ci/metrics-values.yaml +++ b/library/common-test/ci/metrics-values.yaml @@ -24,11 +24,6 @@ workload: startup: enabled: true -manifestManager: - enabled: true - staging: false - - metrics: main: enabled: true diff --git a/library/common-test/ci/mongodb-values.yaml b/library/common-test/ci/mongodb-values.yaml index 6cecec55..06c6588c 100644 --- a/library/common-test/ci/mongodb-values.yaml +++ b/library/common-test/ci/mongodb-values.yaml @@ -24,8 +24,5 @@ workload: startup: enabled: true -manifestManager: - enabled: false - mongodb: enabled: true diff --git a/library/common-test/ci/netshoot-values.yaml b/library/common-test/ci/netshoot-values.yaml index 91812c1f..ea09a9bd 100644 --- a/library/common-test/ci/netshoot-values.yaml +++ b/library/common-test/ci/netshoot-values.yaml @@ -36,15 +36,10 @@ workload: type: http port: "{{ .Values.service.main.ports.main.port }}" - args: - --port - '8080' -manifestManager: - enabled: false - staging: false - addons: netshoot: enabled: true diff --git a/library/common-test/ci/networkPolicy-values.yaml b/library/common-test/ci/networkPolicy-values.yaml index bed4afc5..c7cca36a 100644 --- a/library/common-test/ci/networkPolicy-values.yaml +++ b/library/common-test/ci/networkPolicy-values.yaml @@ -24,11 +24,6 @@ workload: startup: enabled: true -manifestManager: - enabled: false - staging: false - - networkPolicy: main: enabled: true diff --git a/library/common-test/ci/persistence-values.yaml b/library/common-test/ci/persistence-values.yaml index 8f426f45..f4582d6d 100644 --- a/library/common-test/ci/persistence-values.yaml +++ b/library/common-test/ci/persistence-values.yaml @@ -97,6 +97,3 @@ persistence: hostPath: /usr mountPath: /hptest hostPathType: "" - -manifestManager: - enabled: false diff --git a/library/common-test/ci/portal-ingress-values.yaml b/library/common-test/ci/portal-ingress-values.yaml index e549ef31..9e1285e5 100644 --- a/library/common-test/ci/portal-ingress-values.yaml +++ b/library/common-test/ci/portal-ingress-values.yaml @@ -37,11 +37,6 @@ service: protocol: http port: 8081 -manifestManager: - enabled: false - staging: false - - # -- Configure the ingresses for the chart here. # Additional ingresses can be added by adding a dictionary key similar to the 'main' ingress. # @default -- See below diff --git a/library/common-test/ci/portal-svc-values.yaml b/library/common-test/ci/portal-svc-values.yaml index 8922505d..29331e2c 100644 --- a/library/common-test/ci/portal-svc-values.yaml +++ b/library/common-test/ci/portal-svc-values.yaml @@ -37,10 +37,6 @@ service: protocol: http port: 8081 -manifestManager: - enabled: false - staging: false - portal: open: enabled: true diff --git a/library/common-test/ci/priorityclass-values.yaml b/library/common-test/ci/priorityclass-values.yaml index 63ca4ddf..30806614 100644 --- a/library/common-test/ci/priorityclass-values.yaml +++ b/library/common-test/ci/priorityclass-values.yaml @@ -45,6 +45,3 @@ priorityClass: preemptionPolicy: PreemptLowerPriority globalDefault: false description: "some description" - -manifestManager: - enabled: false diff --git a/library/common-test/ci/rbac-values.yaml b/library/common-test/ci/rbac-values.yaml index 9d679e61..65ce60e4 100644 --- a/library/common-test/ci/rbac-values.yaml +++ b/library/common-test/ci/rbac-values.yaml @@ -107,6 +107,3 @@ serviceAccount: enabled: true targetSelector: - workload2 - -manifestManager: - enabled: false diff --git a/library/common-test/ci/redis-values.yaml b/library/common-test/ci/redis-values.yaml index beeb95df..0c5534ac 100644 --- a/library/common-test/ci/redis-values.yaml +++ b/library/common-test/ci/redis-values.yaml @@ -24,8 +24,5 @@ workload: startup: enabled: true -manifestManager: - enabled: false - redis: enabled: true diff --git a/library/common-test/ci/register-operator-values.yaml b/library/common-test/ci/register-operator-values.yaml index c2723315..035f0bb8 100644 --- a/library/common-test/ci/register-operator-values.yaml +++ b/library/common-test/ci/register-operator-values.yaml @@ -42,10 +42,3 @@ args: operator: register: true - -manifestManager: - enabled: false - staging: false - install: false - check: false - delete: false diff --git a/library/common-test/ci/route-values.yaml b/library/common-test/ci/route-values.yaml index a8b2f368..01d6fbaf 100644 --- a/library/common-test/ci/route-values.yaml +++ b/library/common-test/ci/route-values.yaml @@ -37,10 +37,6 @@ service: protocol: http port: 8081 -manifestManager: - enabled: false - staging: false - route: main: enabled: true diff --git a/library/common-test/ci/schedule-values.yaml b/library/common-test/ci/schedule-values.yaml index 7e2155fb..36a590d6 100644 --- a/library/common-test/ci/schedule-values.yaml +++ b/library/common-test/ci/schedule-values.yaml @@ -36,9 +36,6 @@ workload: type: http port: "{{ .Values.service.main.ports.main.port }}" -manifestManager: - enabled: false - schedules: test: enabled: true diff --git a/library/common-test/ci/secrets-values.yaml b/library/common-test/ci/secrets-values.yaml index 39e85a74..fa5270a9 100644 --- a/library/common-test/ci/secrets-values.yaml +++ b/library/common-test/ci/secrets-values.yaml @@ -70,6 +70,3 @@ secret: "key3": "value2" } } - -manifestManager: - enabled: false diff --git a/library/common-test/ci/solr-values.yaml b/library/common-test/ci/solr-values.yaml index 5d29353d..be25f2b0 100644 --- a/library/common-test/ci/solr-values.yaml +++ b/library/common-test/ci/solr-values.yaml @@ -24,8 +24,5 @@ workload: startup: enabled: true -manifestManager: - enabled: false - solr: enabled: true diff --git a/library/common-test/ci/statefulset-values.yaml b/library/common-test/ci/statefulset-values.yaml index 9801d6ff..7f161ee4 100644 --- a/library/common-test/ci/statefulset-values.yaml +++ b/library/common-test/ci/statefulset-values.yaml @@ -42,6 +42,3 @@ persistence: type: vct accessMode: "ReadWriteOnce" size: 1Gi - -manifestManager: - enabled: false diff --git a/library/common-test/ci/storageclass-values.yaml b/library/common-test/ci/storageclass-values.yaml index 3edbc43d..a8683758 100644 --- a/library/common-test/ci/storageclass-values.yaml +++ b/library/common-test/ci/storageclass-values.yaml @@ -60,6 +60,3 @@ storageClass: allowVolumeExpansion: true volumeBindingMode: Immediate mountOptions: [] - -manifestManager: - enabled: false diff --git a/library/common-test/ci/volumesnapshotlocation-values.yaml b/library/common-test/ci/volumesnapshotlocation-values.yaml index 6f3e047d..6eed1b74 100644 --- a/library/common-test/ci/volumesnapshotlocation-values.yaml +++ b/library/common-test/ci/volumesnapshotlocation-values.yaml @@ -36,10 +36,6 @@ workload: type: http port: "{{ .Values.service.main.ports.main.port }}" -manifestManager: - enabled: false - - # Parameters for the VolumeSnapshotLocation(s). Configure multiple by adding other element(s) to the volumeSnapshotLocation slice. # See https://velero.io/docs/v1.6/api-types/volumesnapshotlocation/ volumeSnapshotLocation: diff --git a/library/common-test/ci/vpn-gluetun-values.yaml b/library/common-test/ci/vpn-gluetun-values.yaml index fe00d408..c5e59646 100644 --- a/library/common-test/ci/vpn-gluetun-values.yaml +++ b/library/common-test/ci/vpn-gluetun-values.yaml @@ -40,10 +40,6 @@ args: - --port - '8080' -manifestManager: - enabled: false - staging: false - # -- The common chart supports several add-ons. These can be configured under this key. # @default -- See below addons: diff --git a/library/common-test/ci/vpn-openvpn-values.yaml b/library/common-test/ci/vpn-openvpn-values.yaml index 8da0d08a..c7cf1144 100644 --- a/library/common-test/ci/vpn-openvpn-values.yaml +++ b/library/common-test/ci/vpn-openvpn-values.yaml @@ -40,10 +40,6 @@ args: - --port - '8080' -manifestManager: - enabled: false - staging: false - # -- The common chart supports several add-ons. These can be configured under this key. # @default -- See below addons: diff --git a/library/common-test/ci/vpn-tailscale-values.yaml b/library/common-test/ci/vpn-tailscale-values.yaml index f0ab3204..19aee245 100644 --- a/library/common-test/ci/vpn-tailscale-values.yaml +++ b/library/common-test/ci/vpn-tailscale-values.yaml @@ -40,10 +40,6 @@ args: - --port - '8080' -manifestManager: - enabled: false - staging: false - # -- The common chart supports several add-ons. These can be configured under this key. # @default -- See below addons: diff --git a/library/common-test/ci/vpn-wireguard-values.yaml b/library/common-test/ci/vpn-wireguard-values.yaml index 3a38678f..2f060c31 100644 --- a/library/common-test/ci/vpn-wireguard-values.yaml +++ b/library/common-test/ci/vpn-wireguard-values.yaml @@ -40,10 +40,6 @@ args: - --port - '8080' -manifestManager: - enabled: false - staging: false - # -- The common chart supports several add-ons. These can be configured under this key. # @default -- See below addons: diff --git a/library/common-test/default-values.yaml b/library/common-test/default-values.yaml index 1083365f..65ef0833 100644 --- a/library/common-test/default-values.yaml +++ b/library/common-test/default-values.yaml @@ -13,7 +13,3 @@ service: main: enabled: true port: 80 - -manifestManager: - enabled: false - staging: false diff --git a/library/common-test/tests/addons/codeserver_test.yaml b/library/common-test/tests/addons/codeserver_test.yaml index 2ede86de..c11a48a4 100644 --- a/library/common-test/tests/addons/codeserver_test.yaml +++ b/library/common-test/tests/addons/codeserver_test.yaml @@ -215,9 +215,6 @@ tests: - it: should apply ingress settings with primary set: workload: *workload - operator: - verify: - enabled: false service: main: enabled: true diff --git a/library/common-test/tests/chartContext/data_test.yaml b/library/common-test/tests/chartContext/data_test.yaml index b1c62caf..b6d271a0 100644 --- a/library/common-test/tests/chartContext/data_test.yaml +++ b/library/common-test/tests/chartContext/data_test.yaml @@ -82,9 +82,6 @@ tests: enabled: true host: example.com path: /some-path - operator: - verify: - enabled: false ingress: my-ingress: enabled: "{{ .Values.enabled }}" @@ -129,9 +126,6 @@ tests: - it: should pass with ingress and traefik integration set: createChartContextConfigmap: true - operator: - verify: - enabled: false ingress: my-ingress: enabled: true @@ -179,9 +173,6 @@ tests: - it: should pass with ingress and tls and traefik integration set: createChartContextConfigmap: true - operator: - verify: - enabled: false ingress: my-ingress: enabled: true @@ -233,9 +224,6 @@ tests: - it: should pass with ingress and tls and traefik integration set: createChartContextConfigmap: true - operator: - verify: - enabled: false ingress: my-ingress: enabled: true @@ -287,9 +275,6 @@ tests: - it: should pass with ingress and certManager integration and traefik integration set: createChartContextConfigmap: true - operator: - verify: - enabled: false ingress: my-ingress: enabled: true diff --git a/library/common-test/tests/chartContext/portal_test.yaml b/library/common-test/tests/chartContext/portal_test.yaml index 69fcfea2..47ced775 100644 --- a/library/common-test/tests/chartContext/portal_test.yaml +++ b/library/common-test/tests/chartContext/portal_test.yaml @@ -88,9 +88,6 @@ tests: enabled: true host: example.com path: /some-path - operator: - verify: - enabled: false ingress: my-ingress: enabled: "{{ .Values.enabled }}" @@ -135,9 +132,6 @@ tests: portal: main: enabled: true - operator: - verify: - enabled: false ingress: my-ingress: enabled: true @@ -185,9 +179,6 @@ tests: portal: main: enabled: true - operator: - verify: - enabled: false ingress: my-ingress: enabled: true @@ -239,9 +230,6 @@ tests: portal: main: enabled: true - operator: - verify: - enabled: false ingress: my-ingress: enabled: true @@ -293,9 +281,6 @@ tests: portal: main: enabled: true - operator: - verify: - enabled: false ingress: my-ingress: enabled: true @@ -350,9 +335,6 @@ tests: protocol: "http" host: "test.example.com" port: "123" - operator: - verify: - enabled: false ingress: my-ingress: enabled: true @@ -414,9 +396,6 @@ tests: protocol: "http" host: "test123.example.com" port: "456" - operator: - verify: - enabled: false ingress: my-ingress: enabled: true @@ -488,9 +467,6 @@ tests: path: /some-other-path targetSelector: ingress: my-other-ingress - operator: - verify: - enabled: false ingress: my-ingress: enabled: true @@ -577,9 +553,6 @@ tests: path: /some-other-path targetSelector: service: my-other-service - operator: - verify: - enabled: false service: my-service: enabled: true @@ -642,9 +615,6 @@ tests: targetSelector: service: my-other-service port: my-other-port - operator: - verify: - enabled: false service: my-service: enabled: true @@ -710,9 +680,6 @@ tests: targetSelector: service: my-other-service port: "" - operator: - verify: - enabled: false service: my-service: enabled: true diff --git a/library/common-test/tests/cnpg/backup_metadata_test.yaml b/library/common-test/tests/cnpg/backup_metadata_test.yaml index c60cdc42..3768dfa2 100644 --- a/library/common-test/tests/cnpg/backup_metadata_test.yaml +++ b/library/common-test/tests/cnpg/backup_metadata_test.yaml @@ -9,9 +9,6 @@ release: tests: - it: should pass with cnpg manualBackups backup created with labels and annotations set: - operator: - verify: - enabled: false label1: label1 label2: global_label2 label3: label3 @@ -106,9 +103,6 @@ tests: - it: should pass with cnpg manualBackups backup created with namespace set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -133,9 +127,6 @@ tests: - it: should pass with cnpg manualBackups backup created with object namespace from tpl set: - operator: - verify: - enabled: false key: some-namespace cnpg: my-pg: @@ -161,9 +152,6 @@ tests: - it: should pass with cnpg manualBackups backup created with namespace from global with tpl set: - operator: - verify: - enabled: false key: global-namespace global: namespace: "{{ .Values.key }}" @@ -190,9 +178,6 @@ tests: - it: should pass with cnpg manualBackups backup created with namespace from root with tpl set: - operator: - verify: - enabled: false key: local-namespace namespace: "{{ .Values.key }}" global: @@ -220,9 +205,6 @@ tests: - it: should pass with cnpg manualBackups backup created with namespace in TrueNAS SCALE set: - operator: - verify: - enabled: false global: ixChartContext: iAmNotEmpty: true diff --git a/library/common-test/tests/cnpg/backup_name_test.yaml b/library/common-test/tests/cnpg/backup_name_test.yaml index 346089f1..3984e6c7 100644 --- a/library/common-test/tests/cnpg/backup_name_test.yaml +++ b/library/common-test/tests/cnpg/backup_name_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should generate correct name set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/backup_provider_secret_spec_test.yaml b/library/common-test/tests/cnpg/backup_provider_secret_spec_test.yaml index 70e3b788..275ae0f6 100644 --- a/library/common-test/tests/cnpg/backup_provider_secret_spec_test.yaml +++ b/library/common-test/tests/cnpg/backup_provider_secret_spec_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should create secret for azure provider with connection string set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -47,9 +44,6 @@ tests: - it: should create secret for google provider with application credentials set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -84,9 +78,6 @@ tests: - it: should create secret for s3 provider with application credentials set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/backup_provider_validation_test.yaml b/library/common-test/tests/cnpg/backup_provider_validation_test.yaml index 516f7f79..95540988 100644 --- a/library/common-test/tests/cnpg/backup_provider_validation_test.yaml +++ b/library/common-test/tests/cnpg/backup_provider_validation_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should fail with invalid provider set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -24,9 +21,6 @@ tests: - it: should fail with missing "provider" object set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -41,9 +35,6 @@ tests: - it: should fail with missing storageAccount or connectionString with azure provider set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -60,9 +51,6 @@ tests: - it: should fail with missing storageKey or storageSasToken with azure provider set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -79,9 +67,6 @@ tests: - it: should fail with both storageKey and storageSasToken defined with azure provider set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -100,9 +85,6 @@ tests: - it: should fail with applicationCredentials missing with google provider set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -119,9 +101,6 @@ tests: - it: should fail with accessKey missing with s3 provider set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -138,9 +117,6 @@ tests: - it: should fail with secretKey missing with s3 provider set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/backup_spec_test.yaml b/library/common-test/tests/cnpg/backup_spec_test.yaml index 5865e9f5..5ef4e1ce 100644 --- a/library/common-test/tests/cnpg/backup_spec_test.yaml +++ b/library/common-test/tests/cnpg/backup_spec_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should generate correct spec set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/backup_validation_test.yaml b/library/common-test/tests/cnpg/backup_validation_test.yaml index 7ea2747f..71e1613d 100644 --- a/library/common-test/tests/cnpg/backup_validation_test.yaml +++ b/library/common-test/tests/cnpg/backup_validation_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should fail without name in manualBackups backup set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -26,9 +23,6 @@ tests: - it: should fail with invalid name in manualBackups backup set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/cluster_backup_spec_test.yaml b/library/common-test/tests/cnpg/cluster_backup_spec_test.yaml index 791d939f..c56ea5b1 100644 --- a/library/common-test/tests/cnpg/cluster_backup_spec_test.yaml +++ b/library/common-test/tests/cnpg/cluster_backup_spec_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should generate correct spec with backups (azure) set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -85,9 +82,6 @@ tests: - it: should generate correct spec with backups (google) set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -152,9 +146,6 @@ tests: - it: should generate correct spec with backups (s3) set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -224,9 +215,6 @@ tests: - it: should generate correct spec with empty target set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/cluster_metadata_test.yaml b/library/common-test/tests/cnpg/cluster_metadata_test.yaml index b25725ab..ec3cd7a9 100644 --- a/library/common-test/tests/cnpg/cluster_metadata_test.yaml +++ b/library/common-test/tests/cnpg/cluster_metadata_test.yaml @@ -9,9 +9,6 @@ release: tests: - it: should pass with cnpg created with labels and annotations set: - operator: - verify: - enabled: false label1: label1 label2: global_label2 label3: label3 @@ -92,9 +89,6 @@ tests: - it: should pass with cnpg created with namespace set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -109,9 +103,6 @@ tests: - it: should pass with cnpg created with object namespace from tpl set: - operator: - verify: - enabled: false key: some-namespace cnpg: my-pg: @@ -127,9 +118,6 @@ tests: - it: should pass with cnpg created with namespace from global with tpl set: - operator: - verify: - enabled: false key: global-namespace global: namespace: "{{ .Values.key }}" @@ -146,9 +134,6 @@ tests: - it: should pass with cnpg created with namespace from root with tpl set: - operator: - verify: - enabled: false key: local-namespace namespace: "{{ .Values.key }}" global: @@ -166,9 +151,6 @@ tests: - it: should pass with cnpg created with namespace in TrueNAS SCALE set: - operator: - verify: - enabled: false global: ixChartContext: iAmNotEmpty: true diff --git a/library/common-test/tests/cnpg/cluster_name_test.yaml b/library/common-test/tests/cnpg/cluster_name_test.yaml index 22fd6d10..0aa78156 100644 --- a/library/common-test/tests/cnpg/cluster_name_test.yaml +++ b/library/common-test/tests/cnpg/cluster_name_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should generate correct name set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/cluster_recovery_spec_test.yaml b/library/common-test/tests/cnpg/cluster_recovery_spec_test.yaml index 5d20ff09..50019385 100644 --- a/library/common-test/tests/cnpg/cluster_recovery_spec_test.yaml +++ b/library/common-test/tests/cnpg/cluster_recovery_spec_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should generate correct spec with recovery/backup set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -74,9 +71,6 @@ tests: - it: should generate correct spec with recovery/objectStore (google) set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -148,9 +142,6 @@ tests: - it: should generate correct spec with recovery/objectStore (google - destinationPath) set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -221,9 +212,6 @@ tests: - it: should generate correct spec with recovery/objectStore (s3) set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -296,9 +284,6 @@ tests: - it: should generate correct spec with recovery/objectStore (s3 - destinationPath/endpointURL) set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -370,9 +355,6 @@ tests: - it: should generate correct spec with recovery/objectStore (azure) set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -453,9 +435,6 @@ tests: - it: should generate correct spec with recovery/objectStore (azure - destinationPath) set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/cluster_spec_test.yaml b/library/common-test/tests/cnpg/cluster_spec_test.yaml index 7f0f0c14..5dacac1b 100644 --- a/library/common-test/tests/cnpg/cluster_spec_test.yaml +++ b/library/common-test/tests/cnpg/cluster_spec_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should generate correct spec set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -69,9 +66,6 @@ tests: - it: should override options set: - operator: - verify: - enabled: false ext1: some-extension ext2: some-other-extension cnpg: @@ -178,9 +172,6 @@ tests: - it: should override resources from top level set: - operator: - verify: - enabled: false resources: limits: cpu: 2000m @@ -211,9 +202,6 @@ tests: - it: should pass with custom-conf set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -244,9 +232,6 @@ tests: - it: should pass with timescaledb set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -292,9 +277,6 @@ tests: - it: should pass with enabled monitoring set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -316,9 +298,6 @@ tests: - it: should pass with override monitoring set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/cluster_validation_test.yaml b/library/common-test/tests/cnpg/cluster_validation_test.yaml index 57d57e3c..ff9d1bb6 100644 --- a/library/common-test/tests/cnpg/cluster_validation_test.yaml +++ b/library/common-test/tests/cnpg/cluster_validation_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should fail without user set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -20,9 +17,6 @@ tests: - it: should fail without database set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -33,9 +27,6 @@ tests: - it: should fail with invalid version set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -48,9 +39,6 @@ tests: - it: should fail with hibernate not a bool set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -63,9 +51,6 @@ tests: - it: should fail with invalid mode set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -78,9 +63,6 @@ tests: - it: should fail with invalid type set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -93,9 +75,6 @@ tests: - it: should fail with invalid log level set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -109,9 +88,6 @@ tests: - it: should fail with invalid primaryUpdateStrategy set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -125,9 +101,6 @@ tests: - it: should fail with invalid primaryUpdateMethod set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -141,9 +114,6 @@ tests: - it: should fail with invalid walSegmentSize set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -158,9 +128,6 @@ tests: - it: should fail with too large walSegmentSize set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -175,9 +142,6 @@ tests: - it: should fail without recovery object when mode is recovery set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -190,9 +154,6 @@ tests: - it: should fail with invalid recovery method set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -207,9 +168,6 @@ tests: - it: should fail without backupName on recovery method backup set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -224,9 +182,6 @@ tests: - it: should fail with invalid provider on recovery method object_store set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -242,9 +197,6 @@ tests: - it: should fail with missing "provider" key on recovery method object_store set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -260,9 +212,6 @@ tests: - it: should fail with missing destinationPath and google bucket on recovery method object_store set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -280,9 +229,6 @@ tests: - it: should fail with missing destinationPath and s3 bucket on recovery method object_store set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -301,9 +247,6 @@ tests: - it: should fail with missing endpointURL and s3 region on recovery method object_store set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -323,9 +266,6 @@ tests: - it: should fail with missing destinationPath and azure storageAccount on recovery method object_store set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -343,9 +283,6 @@ tests: - it: should fail with missing destinationPath and azure serviceName on recovery method object_store set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -364,9 +301,6 @@ tests: - it: should fail with missing destinationPath and azure containerName on recovery method object_store set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -386,9 +320,6 @@ tests: - it: should fail with invalid target when backups are enabled set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -406,9 +337,6 @@ tests: - it: should fail with invalid retentionPolicy when backups are enabled set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -427,9 +355,6 @@ tests: - it: should fail with missing destinationPath and google bucket on backups set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -448,9 +373,6 @@ tests: - it: should fail with missing destinationPath and s3 bucket on backups set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -470,9 +392,6 @@ tests: - it: should fail with missing endpointURL and s3 region on backups set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -493,9 +412,6 @@ tests: - it: should fail with missing destinationPath and azure storageAccount on backups set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -514,9 +430,6 @@ tests: - it: should fail with missing destinationPath and azure serviceName on backups set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -536,9 +449,6 @@ tests: - it: should fail with missing destinationPath and azure containerName on backups set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -559,9 +469,6 @@ tests: - it: should fail with instances less than 1 set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/credentials_test.yaml b/library/common-test/tests/cnpg/credentials_test.yaml index 82637038..2107bc64 100644 --- a/library/common-test/tests/cnpg/credentials_test.yaml +++ b/library/common-test/tests/cnpg/credentials_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should generate correct secret set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -67,9 +64,6 @@ tests: - it: should generate correct secret with ro pooler set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -117,9 +111,6 @@ tests: - it: should generate correct secret with password set set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/pooler_metadata_test.yaml b/library/common-test/tests/cnpg/pooler_metadata_test.yaml index 5f9c57b1..5fd77ebd 100644 --- a/library/common-test/tests/cnpg/pooler_metadata_test.yaml +++ b/library/common-test/tests/cnpg/pooler_metadata_test.yaml @@ -9,9 +9,6 @@ release: tests: - it: should pass with cnpg pooler created with labels and annotations set: - operator: - verify: - enabled: false label1: label1 label2: global_label2 label3: label3 @@ -91,9 +88,6 @@ tests: - it: should pass with cnpg pooler created with namespace set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -108,9 +102,6 @@ tests: - it: should pass with cnpg pooler created with object namespace from tpl set: - operator: - verify: - enabled: false key: some-namespace cnpg: my-pg: @@ -126,9 +117,6 @@ tests: - it: should pass with cnpg pooler created with namespace from global with tpl set: - operator: - verify: - enabled: false key: global-namespace global: namespace: "{{ .Values.key }}" @@ -145,9 +133,6 @@ tests: - it: should pass with cnpg pooler created with namespace from root with tpl set: - operator: - verify: - enabled: false key: local-namespace namespace: "{{ .Values.key }}" global: @@ -165,9 +150,6 @@ tests: - it: should pass with cnpg pooler created with namespace in TrueNAS SCALE set: - operator: - verify: - enabled: false global: ixChartContext: iAmNotEmpty: true diff --git a/library/common-test/tests/cnpg/pooler_name_test.yaml b/library/common-test/tests/cnpg/pooler_name_test.yaml index 502295f8..6195ee3a 100644 --- a/library/common-test/tests/cnpg/pooler_name_test.yaml +++ b/library/common-test/tests/cnpg/pooler_name_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should generate correct name set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/pooler_spec_test.yaml b/library/common-test/tests/cnpg/pooler_spec_test.yaml index 8ec230df..b0067471 100644 --- a/library/common-test/tests/cnpg/pooler_spec_test.yaml +++ b/library/common-test/tests/cnpg/pooler_spec_test.yaml @@ -8,9 +8,6 @@ tests: - it: should generate correct spec set: param: someValue - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/pooler_validation_test.yaml b/library/common-test/tests/cnpg/pooler_validation_test.yaml index a3ceaa4e..2665004e 100644 --- a/library/common-test/tests/cnpg/pooler_validation_test.yaml +++ b/library/common-test/tests/cnpg/pooler_validation_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should fail with invalid poolMode set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -23,9 +20,6 @@ tests: - it: should fail with pooler instances less than 1 set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/recovery_configmap_test.yaml b/library/common-test/tests/cnpg/recovery_configmap_test.yaml index 4fb70422..440745a9 100644 --- a/library/common-test/tests/cnpg/recovery_configmap_test.yaml +++ b/library/common-test/tests/cnpg/recovery_configmap_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should create configmap with recovery string when forceRecovery is enabled set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/scheduled_backup_metadata_test.yaml b/library/common-test/tests/cnpg/scheduled_backup_metadata_test.yaml index 697dc62f..773042f1 100644 --- a/library/common-test/tests/cnpg/scheduled_backup_metadata_test.yaml +++ b/library/common-test/tests/cnpg/scheduled_backup_metadata_test.yaml @@ -9,9 +9,6 @@ release: tests: - it: should pass with cnpg scheduledBackup backup created with labels and annotations set: - operator: - verify: - enabled: false label1: label1 label2: global_label2 label3: label3 @@ -108,9 +105,6 @@ tests: - it: should pass with cnpg scheduledBackup backup created with namespace set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -137,9 +131,6 @@ tests: - it: should pass with cnpg scheduledBackup backup created with object namespace from tpl set: - operator: - verify: - enabled: false key: some-namespace cnpg: my-pg: @@ -167,9 +158,6 @@ tests: - it: should pass with cnpg scheduledBackup backup created with namespace from global with tpl set: - operator: - verify: - enabled: false key: global-namespace global: namespace: "{{ .Values.key }}" @@ -198,9 +186,6 @@ tests: - it: should pass with cnpg scheduledBackup backup created with namespace from root with tpl set: - operator: - verify: - enabled: false key: local-namespace namespace: "{{ .Values.key }}" global: @@ -230,9 +215,6 @@ tests: - it: should pass with cnpg scheduledBackup backup created with namespace in TrueNAS SCALE set: - operator: - verify: - enabled: false global: ixChartContext: iAmNotEmpty: true diff --git a/library/common-test/tests/cnpg/scheduled_backup_name_test.yaml b/library/common-test/tests/cnpg/scheduled_backup_name_test.yaml index 9110ae44..9e919882 100644 --- a/library/common-test/tests/cnpg/scheduled_backup_name_test.yaml +++ b/library/common-test/tests/cnpg/scheduled_backup_name_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should generate correct name set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/scheduled_backup_spec_test.yaml b/library/common-test/tests/cnpg/scheduled_backup_spec_test.yaml index 92a93e4a..e94ea14d 100644 --- a/library/common-test/tests/cnpg/scheduled_backup_spec_test.yaml +++ b/library/common-test/tests/cnpg/scheduled_backup_spec_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should generate correct spec set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/scheduled_backup_stop_test.yaml b/library/common-test/tests/cnpg/scheduled_backup_stop_test.yaml index e828d926..137ab650 100644 --- a/library/common-test/tests/cnpg/scheduled_backup_stop_test.yaml +++ b/library/common-test/tests/cnpg/scheduled_backup_stop_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should pass with hibernate set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -43,9 +40,6 @@ tests: - it: should set suspend on stopAll set: - operator: - verify: - enabled: false global: stopAll: true cnpg: @@ -81,9 +75,6 @@ tests: - it: should set suspend on ixChartContext - isStopped (true) set: - operator: - verify: - enabled: false global: namespace: ix-something ixChartContext: @@ -122,9 +113,6 @@ tests: - it: should not suspend on ixChartContext - isStopped (false) set: - operator: - verify: - enabled: false global: namespace: ix-something ixChartContext: diff --git a/library/common-test/tests/cnpg/scheduled_backup_validation_test.yaml b/library/common-test/tests/cnpg/scheduled_backup_validation_test.yaml index 2bb53b11..441f661f 100644 --- a/library/common-test/tests/cnpg/scheduled_backup_validation_test.yaml +++ b/library/common-test/tests/cnpg/scheduled_backup_validation_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should fail without name in scheduledBackups backup set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -28,9 +25,6 @@ tests: - it: should fail without schedule in scheduledBackups backup set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -72,9 +66,6 @@ tests: - it: should fail with invalid name in scheduledBackups backup set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -95,9 +86,6 @@ tests: - it: should fail with suspend not a bool in scheduledBackups backup set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true @@ -119,9 +107,6 @@ tests: - it: should fail with immediate not a bool in scheduledBackups backup set: - operator: - verify: - enabled: false cnpg: my-pg: enabled: true diff --git a/library/common-test/tests/cnpg/stop_test.yaml b/library/common-test/tests/cnpg/stop_test.yaml index 8b13b372..9b70be05 100644 --- a/library/common-test/tests/cnpg/stop_test.yaml +++ b/library/common-test/tests/cnpg/stop_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should pass with hibernate set: - operator: - verify: - enabled: false cnpg: mypg: enabled: true @@ -43,9 +40,6 @@ tests: - it: should set hibernate and 0 instances on stopAll set: - operator: - verify: - enabled: false global: stopAll: true cnpg: @@ -81,9 +75,6 @@ tests: - it: should set hibernate and 0 instances on ixChartContext - isStopped (true) set: - operator: - verify: - enabled: false global: namespace: ix-something ixChartContext: @@ -122,9 +113,6 @@ tests: - it: should not set hibernate and 0 instances on ixChartContext - isStopped (false) set: - operator: - verify: - enabled: false global: namespace: ix-something ixChartContext: @@ -163,9 +151,6 @@ tests: - it: should not set hibernate and 0 instances on ixChartContext - isStopped (true) and ignoreIsStopped (true) set: - operator: - verify: - enabled: false global: namespace: ix-something ignoreIsStopped: true diff --git a/library/common-test/tests/ingress/cert_manager_test.yaml b/library/common-test/tests/ingress/cert_manager_test.yaml index 62c8b52f..c47996f2 100644 --- a/library/common-test/tests/ingress/cert_manager_test.yaml +++ b/library/common-test/tests/ingress/cert_manager_test.yaml @@ -9,9 +9,6 @@ release: tests: - it: should pass with ingress created with annotations from cert manager set: - operator: &operator - verify: - enabled: false service: &service my-service: enabled: true @@ -56,7 +53,6 @@ tests: - it: should pass with ingress created without cert manager annotations when cert manager false set: - operator: *operator service: *service ingress: my-ingress: @@ -82,7 +78,6 @@ tests: # Failures - it: should fail with missing certificateIssuer set: - operator: *operator service: *service ingress: my-ingress1: @@ -98,7 +93,6 @@ tests: - it: should fail with certificateIssuer not a string set: - operator: *operator service: *service ingress: my-ingress1: diff --git a/library/common-test/tests/ingress/homepage_test.yaml b/library/common-test/tests/ingress/homepage_test.yaml index 5edc3ced..7521fab7 100644 --- a/library/common-test/tests/ingress/homepage_test.yaml +++ b/library/common-test/tests/ingress/homepage_test.yaml @@ -15,9 +15,6 @@ tests: k4: some-url k5: some-type k6: some-group - operator: &operator - verify: - enabled: false service: my-service: enabled: true @@ -206,7 +203,6 @@ tests: # Failures - it: should fail with podSelector not a slice set: - operator: *operator service: &service my-service: enabled: true @@ -234,7 +230,6 @@ tests: - it: should fail with custom widget not a map set: - operator: *operator service: *service ingress: my-ingress1: @@ -254,7 +249,6 @@ tests: - it: should fail with customkv widget not a slice set: - operator: *operator service: *service ingress: my-ingress1: @@ -274,7 +268,6 @@ tests: - it: should fail with customkv having empty key set: - operator: *operator service: *service ingress: my-ingress1: diff --git a/library/common-test/tests/ingress/metadata_test.yaml b/library/common-test/tests/ingress/metadata_test.yaml index 76a7f3e4..00b597d4 100644 --- a/library/common-test/tests/ingress/metadata_test.yaml +++ b/library/common-test/tests/ingress/metadata_test.yaml @@ -20,9 +20,6 @@ tests: annotations: g_annotation1: global_annotation1 g_annotation2: "{{ .Values.annotation2 }}" - operator: &operator - verify: - enabled: false service: &service my-service: enabled: true @@ -127,7 +124,6 @@ tests: - it: should pass with ingress created with object namespace from tpl set: key: some-namespace - operator: *operator service: *service ingress: my-ingress1: @@ -147,7 +143,6 @@ tests: key: global-namespace global: namespace: "{{ .Values.key }}" - operator: *operator service: *service ingress: my-ingress1: @@ -167,7 +162,6 @@ tests: namespace: "{{ .Values.key }}" global: namespace: global-namespace - operator: *operator service: *service ingress: my-ingress1: @@ -187,7 +181,6 @@ tests: ixChartContext: iAmNotEmpty: true namespace: ix-namespace - operator: *operator service: *service ingress: my-ingress1: diff --git a/library/common-test/tests/ingress/name_test.yaml b/library/common-test/tests/ingress/name_test.yaml index 833e0460..6d015186 100644 --- a/library/common-test/tests/ingress/name_test.yaml +++ b/library/common-test/tests/ingress/name_test.yaml @@ -7,9 +7,6 @@ release: tests: - it: should generate correct name set: - operator: - verify: - enabled: false service: my-service: enabled: true diff --git a/library/common-test/tests/ingress/rules_test.yaml b/library/common-test/tests/ingress/rules_test.yaml index a31d3424..dd78b5f2 100644 --- a/library/common-test/tests/ingress/rules_test.yaml +++ b/library/common-test/tests/ingress/rules_test.yaml @@ -9,9 +9,6 @@ release: tests: - it: should pass with ingress created with ingressClassName set: - operator: &operator - verify: - enabled: false service: my-service: enabled: true @@ -48,9 +45,6 @@ tests: - it: should pass with ingress created with rules set: - operator: &operator - verify: - enabled: false service: my-service: enabled: true @@ -141,9 +135,6 @@ tests: - it: should pass with ingress created with rules with targetSelector set: - operator: &operator - verify: - enabled: false service: my-service: enabled: true diff --git a/library/common-test/tests/ingress/stop_test.yaml b/library/common-test/tests/ingress/stop_test.yaml index 642b26ea..fb860598 100644 --- a/library/common-test/tests/ingress/stop_test.yaml +++ b/library/common-test/tests/ingress/stop_test.yaml @@ -9,9 +9,6 @@ release: tests: - it: should pass with stopAll set: - operator: &operator - verify: - enabled: false global: stopAll: true service: &service @@ -54,7 +51,6 @@ tests: - it: should pass with ixChartContext - isStopped (true) set: - operator: *operator global: namespace: ix-something ixChartContext: @@ -80,7 +76,6 @@ tests: - it: should pass with ixChartContext - isStopped (false) set: - operator: *operator global: namespace: ix-something ixChartContext: @@ -108,7 +103,6 @@ tests: - it: should ignore isStopped in ixChartContext set: - operator: *operator global: namespace: ix-something ignoreIsStopped: true diff --git a/library/common-test/tests/ingress/tls_test.yaml b/library/common-test/tests/ingress/tls_test.yaml index 6e69e889..e1ba2752 100644 --- a/library/common-test/tests/ingress/tls_test.yaml +++ b/library/common-test/tests/ingress/tls_test.yaml @@ -9,9 +9,6 @@ release: tests: - it: should pass with ingress created with certManager integration set: - operator: &operator - verify: - enabled: false service: &service my-service: enabled: true @@ -59,7 +56,6 @@ tests: - it: should pass with ingress created with clusterCertificate set: - operator: *operator service: *service ingress: my-ingress: @@ -105,7 +101,6 @@ tests: - it: should pass with ingress created with tls with certificateIssuer set: - operator: *operator service: *service otherhost: other-test-host othercertissuer: some-other-issuer diff --git a/library/common-test/tests/ingress/traefik_test.yaml b/library/common-test/tests/ingress/traefik_test.yaml index 10d1fc5e..ecbbec57 100644 --- a/library/common-test/tests/ingress/traefik_test.yaml +++ b/library/common-test/tests/ingress/traefik_test.yaml @@ -9,9 +9,6 @@ release: tests: - it: should pass with ingress created with annotations from traefik set: - operator: &operator - verify: - enabled: false global: &global traefik: fixedMiddlewares: @@ -56,7 +53,6 @@ tests: - it: should pass with ingress created without traefik annotations when traefik false set: - operator: *operator service: *service ingress: my-ingress: @@ -80,7 +76,6 @@ tests: - it: should replace local fixedMiddlewares when allowCors true set: - operator: *operator service: *service global: traefik: @@ -120,7 +115,6 @@ tests: - it: should replace global fixedMiddlewares when allowCors true set: - operator: *operator service: *service global: traefik: @@ -157,7 +151,6 @@ tests: - it: should replace global fixedMiddlewares when local fixedMiddlewares is defined set: - operator: *operator service: *service global: *global ingress: @@ -189,7 +182,6 @@ tests: - it: should override default entrypoint(s) set: - operator: *operator service: *service global: *global ingress: @@ -221,7 +213,6 @@ tests: - it: should not contain fixed middlewares when global is disabled set: - operator: *operator service: *service global: traefik: @@ -247,7 +238,6 @@ tests: - it: should not contain fixed middlewares when local is disabled set: - operator: *operator service: *service global: traefik: @@ -274,7 +264,6 @@ tests: - it: should add the defined middlewares to the ingress set: - operator: *operator service: *service global: *global ingress: @@ -311,7 +300,6 @@ tests: - it: should add the the tls annotation set: - operator: *operator service: *service global: *global ingress: @@ -346,7 +334,6 @@ tests: - it: should not add the the tls annotation set: - operator: *operator service: *service global: *global ingress: @@ -381,7 +368,6 @@ tests: # Failures - it: should fail with entrypoint not a slice set: - operator: *operator service: *service ingress: my-ingress1: @@ -398,7 +384,6 @@ tests: - it: should fail with middlewares not a slice set: - operator: *operator service: *service ingress: my-ingress1: @@ -415,7 +400,6 @@ tests: - it: should fail with fixedMiddlewares not a slice set: - operator: *operator service: *service ingress: my-ingress1: @@ -432,7 +416,6 @@ tests: - it: should fail with duplicate middlewares set: - operator: *operator service: *service global: *global ingress: @@ -452,7 +435,6 @@ tests: - it: should fail with duplicate entrypoints set: - operator: *operator service: *service ingress: my-ingress1: @@ -471,7 +453,6 @@ tests: - it: should fail when a middleware does not have a namespace (or failed to be looked up) set: - operator: *operator service: *service global: *global ingress: diff --git a/library/common-test/tests/ingress/validation_test.yaml b/library/common-test/tests/ingress/validation_test.yaml index 37bbda4e..eaa0af62 100644 --- a/library/common-test/tests/ingress/validation_test.yaml +++ b/library/common-test/tests/ingress/validation_test.yaml @@ -5,11 +5,40 @@ release: name: test-release-name namespace: test-release-namespace tests: + - it: should fail without traefik installed + set: + crd: + verify: + enabled: true + service: + my-service: + enabled: true + primary: true + ports: + main: + enabled: true + primary: true + port: 80 + ingress: + my-ingress: + enabled: true + primary: true + hosts: + - host: test-host + paths: + - path: /test-path + integrations: &integrations + traefik: + enabled: true + fixedMiddlewares: + - name: chain-basic + namespace: test-release-namespace + asserts: + - failedTemplate: + errorMessage: Traefik has to be installed first + - it: should fail if required is true but enabled is false set: - operator: &operator - verify: - enabled: false service: &service my-service: enabled: true @@ -29,7 +58,6 @@ tests: - it: should fail with name longer than 253 characters set: - operator: *operator service: *service ingress: my-ing: @@ -50,7 +78,6 @@ tests: - it: should fail with name starting with underscore set: - operator: *operator service: *service ingress: my-ing: @@ -65,7 +92,6 @@ tests: - it: should fail with namespace longer than 63 characters set: - operator: *operator service: *service ingress: my-ingress: @@ -83,7 +109,6 @@ tests: global: ixChartContext: iAmNotEmpty: true - operator: *operator service: my-service: enabled: true @@ -107,7 +132,6 @@ tests: - it: should fail with labels not a dict set: - operator: *operator ingress: my-ingress: enabled: true @@ -119,7 +143,6 @@ tests: - it: should fail with annotations not a dict set: - operator: *operator ingress: my-ingress: enabled: true @@ -131,7 +154,6 @@ tests: - it: should fail with empty enabled set: - operator: *operator ingress: my-ingress: enabled: @@ -141,7 +163,6 @@ tests: - it: should fail with targetSelector not a map set: - operator: *operator ingress: my-ingress: enabled: true @@ -153,7 +174,6 @@ tests: - it: should fail with targetSelector having more than one key set: - operator: *operator ingress: my-ingress: enabled: true @@ -167,7 +187,6 @@ tests: - it: should fail with targetSelector key missing value set: - operator: *operator ingress: my-ingress: enabled: true @@ -180,7 +199,6 @@ tests: - it: should fail with targetSelector key having non-string value set: - operator: *operator ingress: my-ingress: enabled: true @@ -194,7 +212,6 @@ tests: - it: should fail with no hosts set: - operator: *operator ingress: my-ingress: enabled: true @@ -206,7 +223,6 @@ tests: - it: should fail with hosts not a slice set: - operator: *operator ingress: my-ingress: enabled: true @@ -218,7 +234,6 @@ tests: - it: should fail with no hosts.host set: - operator: *operator ingress: my-ingress: enabled: true @@ -232,7 +247,6 @@ tests: - it: should fail with host starting with https:// set: - operator: *operator ingress: my-ingress: enabled: true @@ -247,7 +261,6 @@ tests: - it: should fail with host starting with http:// set: - operator: *operator ingress: my-ingress: enabled: true @@ -262,7 +275,6 @@ tests: - it: should fail with host contain ":" set: - operator: *operator ingress: my-ingress: enabled: true @@ -277,7 +289,6 @@ tests: - it: should fail without paths set: - operator: *operator ingress: my-ingress: enabled: true @@ -290,7 +301,6 @@ tests: - it: should fail with paths not a slice set: - operator: *operator ingress: my-ingress: enabled: true @@ -304,7 +314,6 @@ tests: - it: should fail with invalid pathType set: - operator: *operator ingress: my-ingress: enabled: true @@ -320,7 +329,6 @@ tests: - it: should fail with path not starting with / (only on pathType Exact and Prefix) set: - operator: *operator ingress: my-ingress: enabled: true @@ -336,7 +344,6 @@ tests: - it: should fail if name in the overrideService is missing set: - operator: *operator ingress: my-ingress: enabled: true @@ -353,7 +360,6 @@ tests: - it: should fail if port in the overrideService is missing set: - operator: *operator ingress: my-ingress: enabled: true @@ -370,7 +376,6 @@ tests: - it: should fail if targeted service does not exist set: - operator: *operator ingress: my-ingress: enabled: true @@ -387,7 +392,6 @@ tests: - it: should fail if targeted service is not enabled set: - operator: *operator service: my-service: enabled: false @@ -413,7 +417,6 @@ tests: - it: should fail without primary service or a targetSelector set: - operator: *operator ingress: my-ingress: enabled: true @@ -428,7 +431,6 @@ tests: - it: should fail if the targeted service does not have the targeted port set: - operator: *operator service: my-service: enabled: true @@ -454,7 +456,6 @@ tests: - it: should fail if the targeted service port is not enabled set: - operator: *operator service: my-service: enabled: true @@ -484,7 +485,6 @@ tests: - it: should fail if tls.hosts are empty set: - operator: *operator service: *service ingress: my-ingress: @@ -499,7 +499,6 @@ tests: - it: should fail if tls.hosts is not a slice set: - operator: *operator service: *service ingress: my-ingress: @@ -514,7 +513,6 @@ tests: - it: should fail if tls.hosts.host is empty set: - operator: *operator service: *service ingress: my-ingress: @@ -530,7 +528,6 @@ tests: - it: should fail if tls.hosts.host starts with https:// set: - operator: *operator service: *service ingress: my-ingress: @@ -546,7 +543,6 @@ tests: - it: should fail if tls.hosts.host starts with http:// set: - operator: *operator service: *service ingress: my-ingress: @@ -562,7 +558,6 @@ tests: - it: should fail if tls.hosts.host contains ":" set: - operator: *operator service: *service ingress: my-ingress: @@ -578,7 +573,6 @@ tests: - it: should fail if more than 1 cert option is set under tls set: - operator: *operator service: *service ingress: my-ingress: @@ -596,7 +590,6 @@ tests: - it: should fail with ingressClassName set to tc-stopped set: - operator: *operator service: *service ingress: my-ingress: diff --git a/library/common-test/tests/service/validation_test.yaml b/library/common-test/tests/service/validation_test.yaml index d118c591..4517aca2 100644 --- a/library/common-test/tests/service/validation_test.yaml +++ b/library/common-test/tests/service/validation_test.yaml @@ -5,6 +5,60 @@ release: name: test-release-name namespace: test-release-namespace tests: + - it: should not fail with 2 primary, 1 disabled + set: + service: + service-name1: + enabled: true + primary: true + ports: + port-name1: + enabled: true + primary: true + port: 12345 + service-name2: + enabled: false + primary: true + ports: + port-name2: + enabled: true + primary: true + port: 12345 + asserts: + - documentIndex: &serviceDoc 0 + isKind: + of: Service + - hasDocuments: + count: 1 + + - it: should not fail with 2 primary, 1 disabled (tpl) + set: + enabled: true + disabled: false + service: + service-name1: + enabled: "{{ .Values.enabled }}" + primary: true + ports: + port-name1: + enabled: true + primary: true + port: 12345 + service-name2: + enabled: "{{ .Values.disabled }}" + primary: true + ports: + port-name2: + enabled: true + primary: true + port: 12345 + asserts: + - documentIndex: &serviceDoc 0 + isKind: + of: Service + - hasDocuments: + count: 1 + - it: should fail without primary service set: service: diff --git a/library/common-test/unit-values.yaml b/library/common-test/unit-values.yaml index 18e98875..e8052652 100644 --- a/library/common-test/unit-values.yaml +++ b/library/common-test/unit-values.yaml @@ -1,3 +1,7 @@ +operator: + verify: + enabled: false + crd: verify: enabled: false diff --git a/library/common-test/values.yaml b/library/common-test/values.yaml index 177ea1f0..8ef27b24 100644 --- a/library/common-test/values.yaml +++ b/library/common-test/values.yaml @@ -18,13 +18,6 @@ service: ports: main: enabled: false -operator: - verify: - failOnError: true - -manifestManager: - enabled: false - staging: false # The above just disables the "main" objects, # every other config is stays as it is set in common's values.yaml. diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml index 9553f9b7..2834134c 100644 --- a/library/common/Chart.yaml +++ b/library/common/Chart.yaml @@ -15,7 +15,7 @@ maintainers: name: common sources: null type: library -version: 18.1.2 +version: 18.1.3 annotations: artifacthub.io/category: "integration-delivery" artifacthub.io/license: "BUSL-1.1" diff --git a/library/common/templates/class/cert-manager/_certificate.tpl b/library/common/templates/class/cert-manager/_certificate.tpl index b2dd323d..1fa6f8cc 100644 --- a/library/common/templates/class/cert-manager/_certificate.tpl +++ b/library/common/templates/class/cert-manager/_certificate.tpl @@ -12,7 +12,7 @@ objectData: {{- define "tc.v1.common.class.certificate" -}} {{- $rootCtx := .rootCtx -}} - {{- $objectData := .objectData }} + {{- $objectData := .objectData -}} {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" $rootCtx "crd" "certificates.cert-manager.io" "missing" "Cert-Manager") }} diff --git a/library/common/templates/class/cnpg/_backup.tpl b/library/common/templates/class/cnpg/_backup.tpl index 2c1b8200..4f330833 100644 --- a/library/common/templates/class/cnpg/_backup.tpl +++ b/library/common/templates/class/cnpg/_backup.tpl @@ -16,7 +16,7 @@ {{- $objAnnotations := $objectData.annotations | default dict -}} {{- $globalBackupAnnotations := $objectData.backups.annotations | default dict -}} {{- $backupAnnotations := $objectData.backupAnnotations | default dict -}} - {{- $backupAnnotations = mustMerge $backupAnnotations $objAnnotations $globalBackupAnnotations }} + {{- $backupAnnotations = mustMerge $backupAnnotations $objAnnotations $globalBackupAnnotations -}} {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" $rootCtx "crd" "backups.postgresql.cnpg.io" "missing" "CloudNative-PG") }} diff --git a/library/common/templates/class/cnpg/_cluster.tpl b/library/common/templates/class/cnpg/_cluster.tpl index b3886d8b..99571434 100644 --- a/library/common/templates/class/cnpg/_cluster.tpl +++ b/library/common/templates/class/cnpg/_cluster.tpl @@ -120,7 +120,7 @@ {{- with $objectData.cluster.walStorage.size -}} {{- $walSize = . -}} - {{- end }} + {{- end -}} {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" $rootCtx "crd" "clusters.postgresql.cnpg.io" "missing" "CloudNative-PG") }} diff --git a/library/common/templates/class/cnpg/_pooler.tpl b/library/common/templates/class/cnpg/_pooler.tpl index 4291d1b6..6ea1d7c3 100644 --- a/library/common/templates/class/cnpg/_pooler.tpl +++ b/library/common/templates/class/cnpg/_pooler.tpl @@ -20,7 +20,7 @@ {{/* Stop All */}} {{- if or $objectData.hibernate (include "tc.v1.common.lib.util.stopAll" $rootCtx) -}} {{- $instances = 0 -}} - {{- end }} + {{- end -}} {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" $rootCtx "crd" "poolers.postgresql.cnpg.io" "missing" "CloudNative-PG") }} diff --git a/library/common/templates/class/cnpg/_scheduledBackup.tpl b/library/common/templates/class/cnpg/_scheduledBackup.tpl index af107439..59f49977 100644 --- a/library/common/templates/class/cnpg/_scheduledBackup.tpl +++ b/library/common/templates/class/cnpg/_scheduledBackup.tpl @@ -29,7 +29,7 @@ {{- $immediate := false -}} {{- if (hasKey $objectData.schedData "immediate") -}} {{- $immediate = $objectData.schedData.immediate -}} - {{- end }} + {{- end -}} {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" $rootCtx "crd" "scheduledbackups.postgresql.cnpg.io" "missing" "CloudNative-PG") }} diff --git a/library/common/templates/class/metrics/_podMonitor.tpl b/library/common/templates/class/metrics/_podMonitor.tpl index 587c8e09..f02dd4dc 100644 --- a/library/common/templates/class/metrics/_podMonitor.tpl +++ b/library/common/templates/class/metrics/_podMonitor.tpl @@ -13,7 +13,7 @@ {{- if and (hasKey $values "nameOverride") $values.nameOverride -}} {{- $podmonitorName = printf "%v-%v" $podmonitorName $values.nameOverride -}} - {{- end }} + {{- end -}} {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" . "crd" "podmonitors.monitoring.coreos.com" "missing" "Prometheus-Operator") }} diff --git a/library/common/templates/class/metrics/_prometheusRule.tpl b/library/common/templates/class/metrics/_prometheusRule.tpl index 9127ba08..4865a01e 100644 --- a/library/common/templates/class/metrics/_prometheusRule.tpl +++ b/library/common/templates/class/metrics/_prometheusRule.tpl @@ -13,7 +13,7 @@ {{- if and (hasKey $values "nameOverride") $values.nameOverride -}} {{- $prometheusruleName = printf "%v-%v" $prometheusruleName $values.nameOverride -}} - {{- end }} + {{- end -}} {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" . "crd" "prometheusrules.monitoring.coreos.com" "missing" "Prometheus-Operator") }} diff --git a/library/common/templates/class/metrics/_serviceMonitor.tpl b/library/common/templates/class/metrics/_serviceMonitor.tpl index f01cea67..c5e1011a 100644 --- a/library/common/templates/class/metrics/_serviceMonitor.tpl +++ b/library/common/templates/class/metrics/_serviceMonitor.tpl @@ -13,7 +13,7 @@ {{- if and (hasKey $values "nameOverride") $values.nameOverride -}} {{- $servicemonitorName = printf "%v-%v" $servicemonitorName $values.nameOverride -}} - {{- end }} + {{- end -}} {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" . "crd" "servicemonitors.monitoring.coreos.com" "missing" "Prometheus-Operator") }} diff --git a/library/common/templates/class/velero/_backupStorageLocation.tpl b/library/common/templates/class/velero/_backupStorageLocation.tpl index 2841411b..f4c6dd7a 100644 --- a/library/common/templates/class/velero/_backupStorageLocation.tpl +++ b/library/common/templates/class/velero/_backupStorageLocation.tpl @@ -13,7 +13,7 @@ objectData: {{- define "tc.v1.common.class.velero.backupstoragelocation" -}} {{- $rootCtx := .rootCtx -}} - {{- $objectData := .objectData }} + {{- $objectData := .objectData -}} {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" $rootCtx "crd" "backupstoragelocations.velero.io" "missing" "Velero") }} diff --git a/library/common/templates/class/velero/_schedule.tpl b/library/common/templates/class/velero/_schedule.tpl index f6cfac86..db59aa25 100644 --- a/library/common/templates/class/velero/_schedule.tpl +++ b/library/common/templates/class/velero/_schedule.tpl @@ -24,7 +24,7 @@ objectData: And use it as the namespace for the schedule too. */}} {{- $namespace = ($lookupBSL.items | first).metadata.namespace -}} - {{- end }} + {{- end -}} {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" $rootCtx "crd" "schedules.velero.io" "missing" "Velero") }} diff --git a/library/common/templates/class/velero/_volumeSnapshotLocation.tpl b/library/common/templates/class/velero/_volumeSnapshotLocation.tpl index 6b416f9a..7dc116f3 100644 --- a/library/common/templates/class/velero/_volumeSnapshotLocation.tpl +++ b/library/common/templates/class/velero/_volumeSnapshotLocation.tpl @@ -13,7 +13,7 @@ objectData: {{- define "tc.v1.common.class.velero.volumesnapshotlocation" -}} {{- $rootCtx := .rootCtx -}} - {{- $objectData := .objectData }} + {{- $objectData := .objectData -}} {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" $rootCtx "crd" "volumesnapshotlocations.velero.io" "missing" "Velero") }} diff --git a/library/common/templates/lib/service/_validation.tpl b/library/common/templates/lib/service/_validation.tpl index 7e888c5b..66e9c736 100644 --- a/library/common/templates/lib/service/_validation.tpl +++ b/library/common/templates/lib/service/_validation.tpl @@ -22,7 +22,16 @@ objectData: {{- $hasEnabledPort := false -}} {{- if ne $objectData.type "ExternalName" -}} {{- range $name, $port := $objectData.ports -}} - {{- if $port.enabled -}} + {{- $enabled := "false" -}} + + {{- if not (kindIs "invalid" $port.enabled) -}} + {{- $enabled = (include "tc.v1.common.lib.util.enabled" (dict + "rootCtx" $rootCtx "objectData" $port + "name" $name "caller" "Service Validation Util" + "key" "port")) -}} + {{- end -}} + + {{- if eq $enabled "true" -}} {{- $hasEnabledPort = true -}} {{- if and $port.targetSelector (not (kindIs "string" $port.targetSelector)) -}} @@ -62,9 +71,16 @@ objectData: {{- $hasEnabled := false -}} {{- range $name, $service := .Values.service -}} + {{- $enabled := "false" -}} - {{/* If service is enabled */}} - {{- if $service.enabled -}} + {{- if not (kindIs "invalid" $service.enabled) -}} + {{- $enabled = (include "tc.v1.common.lib.util.enabled" (dict + "rootCtx" $ "objectData" $service + "name" $name "caller" "Service Validation Util" + "key" "service")) -}} + {{- end -}} + + {{- if eq $enabled "true" -}} {{- $hasEnabled = true -}} {{/* And service is primary */}} diff --git a/library/common/templates/lib/util/_verify_crd.tpl b/library/common/templates/lib/util/_verify_crd.tpl index bcf241d5..7148c617 100644 --- a/library/common/templates/lib/util/_verify_crd.tpl +++ b/library/common/templates/lib/util/_verify_crd.tpl @@ -6,8 +6,7 @@ {{- if $rootCtx.Values.crd.verify.enabled -}} {{- $lookupMiddlewares := (lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" $crd) -}} {{/* If there are items, re-assign the variable */}} - {{- if $lookupMiddlewares -}} - {{- else -}} + {{- if not $lookupMiddlewares -}} {{- fail (printf "%s has to be installed first" $missing) -}} {{- end -}} {{- end -}} diff --git a/library/common/values.yaml b/library/common/values.yaml index d816db96..b4750ac3 100644 --- a/library/common/values.yaml +++ b/library/common/values.yaml @@ -1274,8 +1274,6 @@ redis: enabled: false # -- can be used to make an easy accessible note which URLS to use to access the DB. creds: {} - manifestManager: - enabled: false secret: credentials: enabled: false @@ -1287,8 +1285,6 @@ mariadb: existingSecret: "mariadbcreds" # -- can be used to make an easy accessable note which URLS to use to access the DB. creds: {} - manifestManager: - enabled: false # -- mongodb dependency configuration # @default -- See below @@ -1297,8 +1293,6 @@ mongodb: existingSecret: "mongodbcreds" # -- can be used to make an easy accessable note which URLS to use to access the DB. creds: {} - manifestManager: - enabled: false # -- clickhouse dependency configuration # @default -- See below @@ -1307,8 +1301,6 @@ clickhouse: existingSecret: "clickhousecreds" # -- can be used to make an easy accessable note which URLS to use to access the DB. creds: {} - manifestManager: - enabled: false # -- solr dependency configuration # @default -- See below @@ -1319,8 +1311,6 @@ solr: existingSecret: "solrcreds" # -- can be used to make an easy accessable note which URLS to use to access the DB. creds: {} - manifestManager: - enabled: false # -- List of extra objects to deploy with the release extraTpl: [] diff --git a/run_common_tests.sh b/run_common_tests.sh index df69799c..72d28fbb 100755 --- a/run_common_tests.sh +++ b/run_common_tests.sh @@ -22,6 +22,6 @@ echo "🔨 Building common..." helm dependency update "$common_test_path" echo "🧪 Running tests..." -helm unittest --update-snapshot -f "tests/*/*.yaml" "./$common_test_path" +helm unittest --update-snapshot -f "tests/*/*.yaml" "./$common_test_path" -v ./$common_test_path/unit-values.yaml cleanup