fix previous fix

vshn · Jan 10, 2024 · efee3c7 · efee3c7
1 parent bd7b3aa
commit efee3c7
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 43 deletions.
diff --git a/class/stackgres-operator.yml b/class/stackgres-operator.yml
@@ -31,3 +31,6 @@ parameters:
         - type: jsonnet
           filter: postprocess/fix_null_entries.jsonnet
           path: ${_instance}/01_helmchart/stackgres-operator/crds
+        # - type: jsonnet
+        #   # filter: postprocess/add_missing_fields.jsonnet
+        #   # path: ${_instance}/01_helmchart/stackgres-operator/crds
diff --git a/component/app.jsonnet b/component/app.jsonnet
@@ -23,14 +23,14 @@ local app = argocd.App(instance, params.namespace) +
                   {
                     group: 'admissionregistration.k8s.io',
                     kind: 'ValidatingWebhookConfiguration',
-                    jqPathExpression: [
+                    jqPathExpressions: [
                       '.webhooks[]?.clientConfig.caBundle',
                     ],
                   },
                   {
                     group: 'admissionregistration.k8s.io',
                     kind: 'MutatingWebhookConfiguration',
-                    jqPathExpression: [
+                    jqPathExpressions: [
                       '.webhooks[]?.clientConfig.caBundle',
                     ],
                   },
@@ -42,12 +42,20 @@ local app = argocd.App(instance, params.namespace) +
                       '/spec/renewBefore',
                     ],
                   },
-                  // yq -p yaml -o json tests/golden/defaults/stackgres-operator/stackgres-operator/01_helmchart/stackgres-operator/crds/SGDbOps.yaml | jq '.. | select(.nullable?)'
+                  {
+                    group: 'stackgres.io',
+                    kind: 'SGConfig',
+                    jsonPointers: [
+                      '/spec/rbac',
+                    ],
+                  },
+                  // catching "nullable": "false"
                   {
                     group: 'apiextensions.k8s.io',
                     kind: 'CustomResourceDefinition',
-                    jqPathExpression: [
-                      '.. | select(.nullable?)',
+                    name: 'sgdbops.stackgres.io',
+                    jqPathExpressions: [
+                      '.spec.versions[]?.schema.openAPIV3Schema.properties.status.properties.benchmark.properties.pgbench',
                     ],
                   },
                 ],

diff --git a/postprocess/add_argoCD_annotation.jsonnet b/postprocess/add_argoCD_annotation.jsonnet
diff --git a/tests/golden/defaults/stackgres-operator/apps/stackgres-operator.yaml b/tests/golden/defaults/stackgres-operator/apps/stackgres-operator.yaml
@@ -5,22 +5,27 @@ spec:
         - /spec/replicas
       kind: Deployment
     - group: admissionregistration.k8s.io
-      jqPathExpression:
+      jqPathExpressions:
         - .webhooks[]?.clientConfig.caBundle
       kind: ValidatingWebhookConfiguration
     - group: admissionregistration.k8s.io
-      jqPathExpression:
+      jqPathExpressions:
         - .webhooks[]?.clientConfig.caBundle
       kind: MutatingWebhookConfiguration
     - group: cert-manager.io
       jsonPointers:
         - /spec/duration
         - /spec/renewBefore
       kind: Certificate
+    - group: stackgres.io
+      jsonPointers:
+        - /spec/rbac
+      kind: SGConfig
     - group: apiextensions.k8s.io
-      jqPathExpression:
-        - .. | select(.nullable?)
+      jqPathExpressions:
+        - .spec.versions[]?.schema.openAPIV3Schema.properties.status.properties.benchmark.properties.pgbench
       kind: CustomResourceDefinition
+      name: sgdbops.stackgres.io
   syncPolicy:
     syncOptions:
       - ServerSideApply=true