Merge pull request #641 from HumairAK/fixes

chore: refactor params.env

config/base/kustomization.yaml

@@ -199,5 +199,12 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.V2_DRIVER_IMAGE
+  - name: DSPO_APISERVER_INCLUDE_OWNERREFERENCE
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.DSPO_APISERVER_INCLUDE_OWNERREFERENCE
 configurations:
   - params.yaml

config/base/params.env

@@ -1,28 +1,27 @@
-IMAGES_DSPO=quay.io/opendatahub/data-science-pipelines-operator:latest
 IMAGES_APISERVER=quay.io/opendatahub/ds-pipelines-api-server:v1.6.3
 IMAGES_ARTIFACT=quay.io/opendatahub/ds-pipelines-artifact-manager:v1.6.3
 IMAGES_PERSISTENTAGENT=quay.io/opendatahub/ds-pipelines-persistenceagent:v1.6.3
 IMAGES_SCHEDULEDWORKFLOW=quay.io/opendatahub/ds-pipelines-scheduledworkflow:v1.6.3
 IMAGES_MLMDENVOY=quay.io/opendatahub/ds-pipelines-metadata-envoy:v1.6.3
 IMAGES_MLMDGRPC=quay.io/opendatahub/ds-pipelines-metadata-grpc:v1.6.3
 IMAGES_MLMDWRITER=quay.io/opendatahub/ds-pipelines-metadata-writer:v1.6.3
+IMAGES_DSPO=quay.io/opendatahub/data-science-pipelines-operator:latest
+V2_LAUNCHER_IMAGE=quay.io/opendatahub/ds-pipelines-launcher:latest
+V2_DRIVER_IMAGE=quay.io/opendatahub/ds-pipelines-driver:latest
 IMAGESV2_ARGO_APISERVER=quay.io/opendatahub/ds-pipelines-api-server:latest
 IMAGESV2_ARGO_PERSISTENCEAGENT=quay.io/opendatahub/ds-pipelines-persistenceagent:latest
 IMAGESV2_ARGO_SCHEDULEDWORKFLOW=quay.io/opendatahub/ds-pipelines-scheduledworkflow:latest
-IMAGESV2_ARGO_MLMDENVOY=registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:a744c1b386fd5e4f94e43543e829df1bfdd1b564137917372a11da06872f4bcb
-IMAGESV2_ARGO_MLMDGRPC=quay.io/opendatahub/mlmd-grpc-server:latest
 IMAGESV2_ARGO_WORKFLOWCONTROLLER=quay.io/opendatahub/ds-pipelines-argo-workflowcontroller:3.3.10-upstream
 IMAGESV2_ARGO_ARGOEXEC=quay.io/opendatahub/ds-pipelines-argo-argoexec:3.3.10-upstream
-V2_LAUNCHER_IMAGE=quay.io/opendatahub/ds-pipelines-launcher:latest
-V2_DRIVER_IMAGE=quay.io/opendatahub/ds-pipelines-driver:latest
-IMAGES_CACHE=registry.redhat.io/ubi8/ubi-minimal@sha256:5d2d4d4dbec470f8ffb679915e2a8ae25ad754cd9193fa966deee1ecb7b3ee00
-IMAGES_MOVERESULTSIMAGE=registry.redhat.io/ubi8/ubi-micro@sha256:396baed3d689157d96aa7d8988fdfea7eb36684c8335eb391cf1952573e689c1
+IMAGESV2_ARGO_MLMDGRPC=quay.io/opendatahub/mlmd-grpc-server:latest
+IMAGESV2_ARGO_MLMDENVOY=registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:a744c1b386fd5e4f94e43543e829df1bfdd1b564137917372a11da06872f4bcb
 IMAGES_MARIADB=registry.redhat.io/rhel8/mariadb-103@sha256:3d30992e60774f887c4e7959c81b0c41b0d82d042250b3b56f05ab67fd4cdee1
 IMAGES_OAUTHPROXY=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
+IMAGES_CACHE=registry.redhat.io/ubi8/ubi-minimal@sha256:5d2d4d4dbec470f8ffb679915e2a8ae25ad754cd9193fa966deee1ecb7b3ee00
+IMAGES_MOVERESULTSIMAGE=registry.redhat.io/ubi8/ubi-micro@sha256:396baed3d689157d96aa7d8988fdfea7eb36684c8335eb391cf1952573e689c1
 ZAP_LOG_LEVEL=info
 MAX_CONCURRENT_RECONCILES=10
 DSPO_HEALTHCHECK_DATABASE_CONNECTIONTIMEOUT=15s
 DSPO_HEALTHCHECK_OBJECTSTORE_CONNECTIONTIMEOUT=15s
 DSPO_REQUEUE_TIME=20s
-# DSPO_APISERVER_INCLUDE_OWNERREFERENCE is intended to be used only for tests. It must always be enabled in production
 DSPO_APISERVER_INCLUDE_OWNERREFERENCE=true

config/manager/manager.yaml

@@ -87,6 +87,10 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+          # DSPO_APISERVER_INCLUDE_OWNERREFERENCE is intended to be used only for tests.
+          # It must always be enabled in production
+          - name: DSPO_APISERVER_INCLUDE_OWNERREFERENCE
+            value: $(DSPO_APISERVER_INCLUDE_OWNERREFERENCE)
         securityContext:
           allowPrivilegeEscalation: false
           capabilities: