From 324e3bd91a270883e8faa8c23d4953a0737458f8 Mon Sep 17 00:00:00 2001 From: git-hyagi <45576767+git-hyagi@users.noreply.github.com> Date: Tue, 5 Dec 2023 08:20:23 -0300 Subject: [PATCH] Update signing_scripts_configmap deprecated field It was breaking prow tests. [noissue] --- .ci/prow/openshift-test.sh | 2 +- bundle/manifests/pulp-operator.clusterserviceversion.yaml | 2 +- config/manifests/bases/pulp-operator.clusterserviceversion.yaml | 2 +- config/samples/pulpproject_v1beta1_pulp_cr.galaxy.ocp.ci.yaml | 2 +- config/samples/simple-external-cache.yaml | 2 +- config/samples/simple-external-db.yaml | 2 +- config/samples/simple-sso.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ci/prow/openshift-test.sh b/.ci/prow/openshift-test.sh index d3ec1cc04..1e69505ca 100755 --- a/.ci/prow/openshift-test.sh +++ b/.ci/prow/openshift-test.sh @@ -35,7 +35,7 @@ echo $ROUTE_HOST if [[ "$CI_TEST" == "galaxy" ]]; then CR_FILE=config/samples/pulpproject_v1beta1_pulp_cr.galaxy.ocp.ci.yaml oc apply -f .ci/assets/kubernetes/galaxy_sign.secret.yaml - oc apply -f .ci/assets/kubernetes/signing_scripts.configmap.yaml + oc apply -f .ci/assets/kubernetes/signing_scripts.yaml else CR_FILE=config/samples/pulpproject_v1beta1_pulp_cr.ocp.ci.yaml fi diff --git a/bundle/manifests/pulp-operator.clusterserviceversion.yaml b/bundle/manifests/pulp-operator.clusterserviceversion.yaml index 6aef4f2b3..9d33511b4 100644 --- a/bundle/manifests/pulp-operator.clusterserviceversion.yaml +++ b/bundle/manifests/pulp-operator.clusterserviceversion.yaml @@ -168,7 +168,7 @@ metadata: capabilities: Full Lifecycle categories: Integration & Delivery containerImage: quay.io/pulp/pulp-operator:devel - createdAt: "2023-12-04T14:48:41Z" + createdAt: "2023-12-05T11:18:07Z" description: Pulp is a platform for managing repositories of software packages and making them available to a large number of consumers. operators.operatorframework.io/builder: operator-sdk-v1.29.0 diff --git a/config/manifests/bases/pulp-operator.clusterserviceversion.yaml b/config/manifests/bases/pulp-operator.clusterserviceversion.yaml index 603b554ba..a0b9e6303 100644 --- a/config/manifests/bases/pulp-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/pulp-operator.clusterserviceversion.yaml @@ -105,7 +105,7 @@ metadata: "content_origin": "http://nodeport.local:30000", "token_server": "http://nodeport.local:30000/token/" }, - "signing_scripts_configmap": "signing-scripts", + "signing_scripts": "signing-scripts", "signing_secret": "signing-galaxy", "web": { "replicas": 1, diff --git a/config/samples/pulpproject_v1beta1_pulp_cr.galaxy.ocp.ci.yaml b/config/samples/pulpproject_v1beta1_pulp_cr.galaxy.ocp.ci.yaml index 54d10e477..918efa2c9 100644 --- a/config/samples/pulpproject_v1beta1_pulp_cr.galaxy.ocp.ci.yaml +++ b/config/samples/pulpproject_v1beta1_pulp_cr.galaxy.ocp.ci.yaml @@ -10,7 +10,7 @@ spec: image_web_version: 4.6.3 admin_password_secret: "example-pulp-admin-password" signing_secret: "signing-galaxy" - signing_scripts_configmap: "signing-scripts" + signing_scripts: "signing-scripts" ingress_type: route route_host: route_host_placeholder route_tls_termination_mechanism: edge diff --git a/config/samples/simple-external-cache.yaml b/config/samples/simple-external-cache.yaml index d7a5f222d..0ab4692d3 100644 --- a/config/samples/simple-external-cache.yaml +++ b/config/samples/simple-external-cache.yaml @@ -18,7 +18,7 @@ spec: file_storage_access_mode: "ReadWriteOnce" file_storage_size: "2Gi" signing_secret: "signing-galaxy" - signing_scripts_configmap: "signing-scripts" + signing_scripts: "signing-scripts" image_web: "quay.io/pulp/galaxy-web" ingress_type: nodeport diff --git a/config/samples/simple-external-db.yaml b/config/samples/simple-external-db.yaml index 0c5e0bec8..de9e42a41 100644 --- a/config/samples/simple-external-db.yaml +++ b/config/samples/simple-external-db.yaml @@ -21,7 +21,7 @@ spec: file_storage_access_mode: "ReadWriteOnce" file_storage_size: "2Gi" signing_secret: "signing-galaxy" - signing_scripts_configmap: "signing-scripts" + signing_scripts: "signing-scripts" image_web: "quay.io/pulp/galaxy-web" ingress_type: nodeport diff --git a/config/samples/simple-sso.yaml b/config/samples/simple-sso.yaml index 034e0517c..61efe67c9 100644 --- a/config/samples/simple-sso.yaml +++ b/config/samples/simple-sso.yaml @@ -32,7 +32,7 @@ spec: file_storage_size: "2Gi" file_storage_storage_class: "standard" signing_secret: "signing-galaxy" - signing_scripts_configmap: "signing-scripts" + signing_scripts: "signing-scripts" image_web: "quay.io/pulp/pulp-web" redis_storage_class: standard