From cb31ef65cda17e3537304420a9423e2b0e629322 Mon Sep 17 00:00:00 2001 From: Zhiwei Yin Date: Wed, 25 Sep 2024 09:22:31 +0000 Subject: [PATCH] udpate charts Signed-off-by: Zhiwei Yin --- Makefile | 4 +- README.md | 11 +-- e2e/mce-chart/templates/_helpers.tpl | 10 +++ e2e/mce-chart/templates/deployment.yaml | 74 +++++++++++++++++++ e2e/mce-chart/values.yaml | 3 +- hack/e2e.sh | 28 +++---- {acm-addons => policy}/Chart.yaml | 2 +- .../charts/cluster-lifecycle/Chart.yaml | 0 .../cluster-lifecycle/templates/_helpers.tpl | 0 .../templates/clusterrole.yaml | 0 .../templates/clusterrolebinding.yaml | 0 .../templates/deployment.yaml | 0 .../templates/serviceaccount.yaml | 0 .../charts/cluster-lifecycle/values.yaml | 0 {acm-addons => policy}/charts/grc/Chart.yaml | 0 .../charts/grc/templates/_helpers.tpl | 0 .../config-policy-clustermanagementaddon.yaml | 0 ...licy-framework-clustermanagementaddon.yaml | 0 .../charts/grc/templates/grc-clusterrole.yaml | 0 .../grc/templates/grc-clusterrolebinding.yaml | 0 .../grc-policy-addon-controller.yaml | 0 .../grc/templates/grc-policy-addon-role.yaml | 0 .../grc-policy-addon-rolebinding.yaml | 0 .../grc/templates/grc-policy-addon-sa.yaml | 0 .../grc/templates/grc-policy-propagator.yaml | 0 .../charts/grc/templates/grc-role.yaml | 0 .../charts/grc/templates/grc-rolebinding.yaml | 0 .../charts/grc/templates/grc-sa.yaml | 0 .../templates/policyaddon-clusterrole.yaml | 0 .../policyaddon-clusterrolebinding.yaml | 0 {acm-addons => policy}/charts/grc/values.yaml | 0 ...agement.io_klusterletaddonconfigs_crd.yaml | 0 ...r-management.io_placementrules_crd_v1.yaml | 0 ...uster-management.io_placementbindings.yaml | 0 ...y.open-cluster-management.io_policies.yaml | 0 ...uster-management.io_policyautomations.yaml | 0 ...open-cluster-management.io_policysets.yaml | 0 {acm-addons => policy}/values.yaml | 2 +- 38 files changed, 102 insertions(+), 32 deletions(-) rename {acm-addons => policy}/Chart.yaml (84%) rename {acm-addons => policy}/charts/cluster-lifecycle/Chart.yaml (100%) rename {acm-addons => policy}/charts/cluster-lifecycle/templates/_helpers.tpl (100%) rename {acm-addons => policy}/charts/cluster-lifecycle/templates/clusterrole.yaml (100%) rename {acm-addons => policy}/charts/cluster-lifecycle/templates/clusterrolebinding.yaml (100%) rename {acm-addons => policy}/charts/cluster-lifecycle/templates/deployment.yaml (100%) rename {acm-addons => policy}/charts/cluster-lifecycle/templates/serviceaccount.yaml (100%) rename {acm-addons => policy}/charts/cluster-lifecycle/values.yaml (100%) rename {acm-addons => policy}/charts/grc/Chart.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/_helpers.tpl (100%) rename {acm-addons => policy}/charts/grc/templates/config-policy-clustermanagementaddon.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/governance-policy-framework-clustermanagementaddon.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/grc-clusterrole.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/grc-clusterrolebinding.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/grc-policy-addon-controller.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/grc-policy-addon-role.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/grc-policy-addon-rolebinding.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/grc-policy-addon-sa.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/grc-policy-propagator.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/grc-role.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/grc-rolebinding.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/grc-sa.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/policyaddon-clusterrole.yaml (100%) rename {acm-addons => policy}/charts/grc/templates/policyaddon-clusterrolebinding.yaml (100%) rename {acm-addons => policy}/charts/grc/values.yaml (100%) rename {acm-addons => policy}/crds/agent.open-cluster-management.io_klusterletaddonconfigs_crd.yaml (100%) rename {acm-addons => policy}/crds/apps.open-cluster-management.io_placementrules_crd_v1.yaml (100%) rename {acm-addons => policy}/crds/policy.open-cluster-management.io_placementbindings.yaml (100%) rename {acm-addons => policy}/crds/policy.open-cluster-management.io_policies.yaml (100%) rename {acm-addons => policy}/crds/policy.open-cluster-management.io_policyautomations.yaml (100%) rename {acm-addons => policy}/crds/policy.open-cluster-management.io_policysets.yaml (100%) rename {acm-addons => policy}/values.yaml (89%) diff --git a/Makefile b/Makefile index 9b63907..557e8b3 100644 --- a/Makefile +++ b/Makefile @@ -24,8 +24,8 @@ update: install-mce: ensure-helm $(HELM) install mce ./e2e/mce-chart -install-acm-addons: ensure-helm - $(HELM) install acm-addons ./acm-addons +install-policy: ensure-helm + $(HELM) install policy ./policy test-e2e: hack/e2e.sh diff --git a/README.md b/README.md index 83dc675..997b335 100644 --- a/README.md +++ b/README.md @@ -15,20 +15,15 @@ The MCE operator is required to be installed on the Hub cluster. kubectl apply -f ./configuration/klusterletconfig.yaml ``` -2. Patch the `addonDeploymentConfig` for hypershift addon on non-OCP case. -``` -kubectl apply -f ./configuration/addondeploymentconfig.yaml -``` - -# Install ACM addons after MCE is installed +# Install Policy after MCE is installed ``` -helm install acm-addon ./acm-addons +helm install acm-addon ./policy ``` # Enable policy addon for local-cluster ``` kubectl apply -f ./configuration/klusterletaddonconfig.yaml -``` \ No newline at end of file +``` diff --git a/e2e/mce-chart/templates/_helpers.tpl b/e2e/mce-chart/templates/_helpers.tpl index 00db3d4..2ba822b 100644 --- a/e2e/mce-chart/templates/_helpers.tpl +++ b/e2e/mce-chart/templates/_helpers.tpl @@ -101,3 +101,13 @@ {{- end }} {{- end }} {{- end }} + +{{- define "kube_rbac_proxy_mce" }} +{{- with .Values.images }} +{{- if .overrides.kube_rbac_proxy_mce }} +{{- printf "%s" .overrides.kube_rbac_proxy_mce }} +{{- else }} +{{- printf "%s/kube-rbac-proxy-mce:%s" .registry .tag }} +{{- end }} +{{- end }} +{{- end }} diff --git a/e2e/mce-chart/templates/deployment.yaml b/e2e/mce-chart/templates/deployment.yaml index 97c0087..e7e7d4b 100644 --- a/e2e/mce-chart/templates/deployment.yaml +++ b/e2e/mce-chart/templates/deployment.yaml @@ -55,6 +55,78 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace + - name: OPERAND_IMAGE_APISERVER_NETWORK_PROXY + value: quay.io/stolostron/apiserver-network-proxy@sha256 + - name: OPERAND_IMAGE_ASSISTED_IMAGE_SERVICE + value: quay.io/stolostron/assisted-image-service@sha256 + - name: OPERAND_IMAGE_ASSISTED_INSTALLER + value: quay.io/stolostron/assisted-installer@sha256 + - name: OPERAND_IMAGE_ASSISTED_INSTALLER_AGENT + value: quay.io/stolostron/assisted-installer-agent@sha256 + - name: OPERAND_IMAGE_ASSISTED_INSTALLER_CONTROLLER + value: quay.io/stolostron/assisted-installer-controller@sha256 + - name: OPERAND_IMAGE_ASSISTED_SERVICE_9 + value: quay.io/stolostron/assisted-service@sha256 + - name: OPERAND_IMAGE_ASSISTED_SERVICE_8 + value: quay.io/stolostron/assisted-service-el8@sha256 + - name: OPERAND_IMAGE_AWS_ENCRYPTION_PROVIDER + value: quay.io/stolostron/aws-encryption-provider@sha256 + - name: OPERAND_IMAGE_BACKPLANE_MUST_GATHER + value: quay.io/stolostron/backplane-must-gather@sha256 + - name: OPERAND_IMAGE_BACKPLANE_OPERATOR_TEST + value: quay.io/stolostron/backplane-operator-test@sha256 + - name: OPERAND_IMAGE_CLUSTER_API + value: quay.io/stolostron/cluster-api@sha256 + - name: OPERAND_IMAGE_CLUSTER_API_PROVIDER_AWS + value: quay.io/stolostron/cluster-api-aws-controller@sha256 + - name: OPERAND_IMAGE_CLUSTER_API_PROVIDER_AGENT + value: quay.io/stolostron/cluster-api-provider-agent@sha256 + - name: OPERAND_IMAGE_CLUSTER_API_PROVIDER_AZURE + value: quay.io/stolostron/cluster-api-provider-azure@sha256 + - name: OPERAND_IMAGE_CLUSTER_API_PROVIDER_KUBEVIRT + value: quay.io/stolostron/cluster-api-provider-kubevirt@sha256 + - name: OPERAND_IMAGE_CLUSTER_CURATOR_CONTROLLER + value: quay.io/stolostron/cluster-curator-controller@sha256 + - name: OPERAND_IMAGE_CLUSTER_IMAGE_SET_CONTROLLER + value: quay.io/stolostron/cluster-image-set-controller@sha256 + - name: OPERAND_IMAGE_CLUSTER_PROXY + value: quay.io/stolostron/cluster-proxy@sha256 + - name: OPERAND_IMAGE_CLUSTER_PROXY_ADDON + value: quay.io/stolostron/cluster-proxy-addon@sha256 + - name: OPERAND_IMAGE_CLUSTERCLAIMS_CONTROLLER + value: quay.io/stolostron/clusterclaims-controller@sha256 + - name: OPERAND_IMAGE_CLUSTERLIFECYCLE_STATE_METRICS + value: quay.io/stolostron/clusterlifecycle-state-metrics@sha256 + - name: OPERAND_IMAGE_CONSOLE_MCE + value: quay.io/stolostron/console-mce@sha256 + - name: OPERAND_IMAGE_DISCOVERY_OPERATOR + value: quay.io/stolostron/discovery-operator@sha256 + - name: OPERAND_IMAGE_DISCOVERY_OPERATOR_TESTS + value: quay.io/stolostron/discovery-operator-tests@sha256 + - name: OPERAND_IMAGE_DISCOVERY_TESTSERVER + value: quay.io/stolostron/discovery-testserver@sha256 + - name: OPERAND_IMAGE_FOUNDATION_E2E + value: quay.io/stolostron/foundation-e2e@sha256 + - name: OPERAND_IMAGE_HELLOPROW_GO + value: quay.io/stolostron/helloprow-go@sha256 + - name: OPERAND_IMAGE_HELLOWORLD + value: quay.io/stolostron/helloworld@sha256 + - name: OPERAND_IMAGE_OPENSHIFT_HIVE + value: quay.io/stolostron/hive@sha256 + - name: OPERAND_IMAGE_HYPERSHIFT_ADDON_OPERATOR_CANARY_TEST + value: quay.io/stolostron/hypershift-addon-operator-canary-test@sha256 + - name: OPERAND_IMAGE_HYPERSHIFT_OPERATOR + value: quay.io/stolostron/hypershift-operator@sha256 + - name: OPERAND_IMAGE_IMAGE_BASED_INSTALL_OPERATOR + value: quay.io/stolostron/image-based-install-operator@sha256 + - name: OPERAND_IMAGE_MANAGED_SERVICEACCOUNT + value: quay.io/stolostron/managed-serviceaccount@sha256 + - name: OPERAND_IMAGE_MANAGED_SERVICEACCOUNT_E2E + value: quay.io/stolostron/managed-serviceaccount-e2e@sha256 + - name: OPERAND_IMAGE_POSTGRESQL_12 + value: quay.io/stolostron/postgresql-12-centos7@sha256 + - name: OPERAND_IMAGE_PROVIDER_CREDENTIAL_CONTROLLER + value: quay.io/stolostron/provider-credential-controller@sha256 - name: OPERAND_IMAGE_ADDON_MANAGER value: {{ template "addon_manager" . }} - name: OPERAND_IMAGE_BACKPLANE_OPERATOR @@ -73,6 +145,8 @@ spec: value: {{ template "registration_operator" . }} - name: OPERAND_IMAGE_WORK value: {{ template "work" . }} + - name: OPERAND_IMAGE_KUBE_RBAC_PROXY_MCE + value: {{ template "kube_rbac_proxy_mce" . }} - name: OPERATOR_VERSION value: {{ .Chart.AppVersion }} - name: OPERATOR_PACKAGE diff --git a/e2e/mce-chart/values.yaml b/e2e/mce-chart/values.yaml index 80969a0..1f78f0a 100644 --- a/e2e/mce-chart/values.yaml +++ b/e2e/mce-chart/values.yaml @@ -2,7 +2,7 @@ replicaCount: 1 images: registry: "quay.io/stolostron" - tag: "2.7.0-BACKPLANE-2024-09-23-23-56-45" + tag: "2.12.0-SNAPSHOT-2024-09-24-23-38-54" # the components image name fromat is regisrtry/component:tag, the images.overrides can override the image if not empty. overrides: @@ -15,5 +15,6 @@ images: work: "" registration: "" placement: "" + kube_rbac_proxy_mce: "" imageCredentials: dockerConfigJson: "" diff --git a/hack/e2e.sh b/hack/e2e.sh index fc5f00e..f13d36a 100755 --- a/hack/e2e.sh +++ b/hack/e2e.sh @@ -47,15 +47,6 @@ echo "" echo "###### Wait unitl cluster-manager is created ######" waitForReady "kubectl get clustermanagers.operator.open-cluster-management.io | grep -c \"cluster-manager\"" 1 -echo "" -echo "###### Wait unitl local-cluster is created ######" -waitForReady "kubectl get mcl | grep -c \"local-cluster\"" 1 - -echo "" -echo "###### Wait unitl MCE CR is Available ######" -# TODO: set to 1 after MCE can be Available -waitForReady "kubectl get mce multiclusterengine | grep -c \"Available\"" 0 - echo "" echo "#### Configure MCE ####" @@ -69,26 +60,25 @@ echo "###### Create global klusterletconfig ######" kubectl apply -f ./configuration/klusterletconfig.yaml echo "" -echo "###### Wait until addondeploymentconfigs CRD is installed ######" -waitForReady "kubectl get crds | grep -c \"addondeploymentconfigs\"" 1 +echo "###### Wait unitl local-cluster is created ######" +waitForReady "kubectl get mcl | grep -c \"local-cluster\"" 1 -echo "" -echo "###### Patch addondeploymentconfig for hypershift addon ######" -kubectl apply -f configuration/addondeploymentconfig.yaml +echo "" +echo "###### Wait unitl MCE CR is Available ######" +waitForReady "kubectl get mce multiclusterengine | grep -c \"Available\"" 1 echo "" -echo "#### Install ACM addons #####" -make install-acm-addons +echo "#### Install Policy addons #####" +make install-policy echo "" -echo "###### Enable policy for local-cluster ######" +echo "###### Enable policy addons for local-cluster ######" kubectl apply -f ./configuration/klusterletaddonconfig.yaml echo "" echo "###### Wait unitl 4 addons in local-cluster is Available ######" -# TODO: set to 4 after hypershift addon is Available. -waitForReady "kubectl get mca -n local-cluster | grep -c \"True\"" 3 +waitForReady "kubectl get mca -n local-cluster | grep -c \"True\"" 4 echo "" echo "!!!!!!!!!! MCE + policy is installed succussfully !!!!!!!!!!!!" diff --git a/acm-addons/Chart.yaml b/policy/Chart.yaml similarity index 84% rename from acm-addons/Chart.yaml rename to policy/Chart.yaml index dd50ad2..d767237 100644 --- a/acm-addons/Chart.yaml +++ b/policy/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: 2.12.0 version: 2.12.0 description: A Helm chart for ACM addons -name: acm-addons +name: policy diff --git a/acm-addons/charts/cluster-lifecycle/Chart.yaml b/policy/charts/cluster-lifecycle/Chart.yaml similarity index 100% rename from acm-addons/charts/cluster-lifecycle/Chart.yaml rename to policy/charts/cluster-lifecycle/Chart.yaml diff --git a/acm-addons/charts/cluster-lifecycle/templates/_helpers.tpl b/policy/charts/cluster-lifecycle/templates/_helpers.tpl similarity index 100% rename from acm-addons/charts/cluster-lifecycle/templates/_helpers.tpl rename to policy/charts/cluster-lifecycle/templates/_helpers.tpl diff --git a/acm-addons/charts/cluster-lifecycle/templates/clusterrole.yaml b/policy/charts/cluster-lifecycle/templates/clusterrole.yaml similarity index 100% rename from acm-addons/charts/cluster-lifecycle/templates/clusterrole.yaml rename to policy/charts/cluster-lifecycle/templates/clusterrole.yaml diff --git a/acm-addons/charts/cluster-lifecycle/templates/clusterrolebinding.yaml b/policy/charts/cluster-lifecycle/templates/clusterrolebinding.yaml similarity index 100% rename from acm-addons/charts/cluster-lifecycle/templates/clusterrolebinding.yaml rename to policy/charts/cluster-lifecycle/templates/clusterrolebinding.yaml diff --git a/acm-addons/charts/cluster-lifecycle/templates/deployment.yaml b/policy/charts/cluster-lifecycle/templates/deployment.yaml similarity index 100% rename from acm-addons/charts/cluster-lifecycle/templates/deployment.yaml rename to policy/charts/cluster-lifecycle/templates/deployment.yaml diff --git a/acm-addons/charts/cluster-lifecycle/templates/serviceaccount.yaml b/policy/charts/cluster-lifecycle/templates/serviceaccount.yaml similarity index 100% rename from acm-addons/charts/cluster-lifecycle/templates/serviceaccount.yaml rename to policy/charts/cluster-lifecycle/templates/serviceaccount.yaml diff --git a/acm-addons/charts/cluster-lifecycle/values.yaml b/policy/charts/cluster-lifecycle/values.yaml similarity index 100% rename from acm-addons/charts/cluster-lifecycle/values.yaml rename to policy/charts/cluster-lifecycle/values.yaml diff --git a/acm-addons/charts/grc/Chart.yaml b/policy/charts/grc/Chart.yaml similarity index 100% rename from acm-addons/charts/grc/Chart.yaml rename to policy/charts/grc/Chart.yaml diff --git a/acm-addons/charts/grc/templates/_helpers.tpl b/policy/charts/grc/templates/_helpers.tpl similarity index 100% rename from acm-addons/charts/grc/templates/_helpers.tpl rename to policy/charts/grc/templates/_helpers.tpl diff --git a/acm-addons/charts/grc/templates/config-policy-clustermanagementaddon.yaml b/policy/charts/grc/templates/config-policy-clustermanagementaddon.yaml similarity index 100% rename from acm-addons/charts/grc/templates/config-policy-clustermanagementaddon.yaml rename to policy/charts/grc/templates/config-policy-clustermanagementaddon.yaml diff --git a/acm-addons/charts/grc/templates/governance-policy-framework-clustermanagementaddon.yaml b/policy/charts/grc/templates/governance-policy-framework-clustermanagementaddon.yaml similarity index 100% rename from acm-addons/charts/grc/templates/governance-policy-framework-clustermanagementaddon.yaml rename to policy/charts/grc/templates/governance-policy-framework-clustermanagementaddon.yaml diff --git a/acm-addons/charts/grc/templates/grc-clusterrole.yaml b/policy/charts/grc/templates/grc-clusterrole.yaml similarity index 100% rename from acm-addons/charts/grc/templates/grc-clusterrole.yaml rename to policy/charts/grc/templates/grc-clusterrole.yaml diff --git a/acm-addons/charts/grc/templates/grc-clusterrolebinding.yaml b/policy/charts/grc/templates/grc-clusterrolebinding.yaml similarity index 100% rename from acm-addons/charts/grc/templates/grc-clusterrolebinding.yaml rename to policy/charts/grc/templates/grc-clusterrolebinding.yaml diff --git a/acm-addons/charts/grc/templates/grc-policy-addon-controller.yaml b/policy/charts/grc/templates/grc-policy-addon-controller.yaml similarity index 100% rename from acm-addons/charts/grc/templates/grc-policy-addon-controller.yaml rename to policy/charts/grc/templates/grc-policy-addon-controller.yaml diff --git a/acm-addons/charts/grc/templates/grc-policy-addon-role.yaml b/policy/charts/grc/templates/grc-policy-addon-role.yaml similarity index 100% rename from acm-addons/charts/grc/templates/grc-policy-addon-role.yaml rename to policy/charts/grc/templates/grc-policy-addon-role.yaml diff --git a/acm-addons/charts/grc/templates/grc-policy-addon-rolebinding.yaml b/policy/charts/grc/templates/grc-policy-addon-rolebinding.yaml similarity index 100% rename from acm-addons/charts/grc/templates/grc-policy-addon-rolebinding.yaml rename to policy/charts/grc/templates/grc-policy-addon-rolebinding.yaml diff --git a/acm-addons/charts/grc/templates/grc-policy-addon-sa.yaml b/policy/charts/grc/templates/grc-policy-addon-sa.yaml similarity index 100% rename from acm-addons/charts/grc/templates/grc-policy-addon-sa.yaml rename to policy/charts/grc/templates/grc-policy-addon-sa.yaml diff --git a/acm-addons/charts/grc/templates/grc-policy-propagator.yaml b/policy/charts/grc/templates/grc-policy-propagator.yaml similarity index 100% rename from acm-addons/charts/grc/templates/grc-policy-propagator.yaml rename to policy/charts/grc/templates/grc-policy-propagator.yaml diff --git a/acm-addons/charts/grc/templates/grc-role.yaml b/policy/charts/grc/templates/grc-role.yaml similarity index 100% rename from acm-addons/charts/grc/templates/grc-role.yaml rename to policy/charts/grc/templates/grc-role.yaml diff --git a/acm-addons/charts/grc/templates/grc-rolebinding.yaml b/policy/charts/grc/templates/grc-rolebinding.yaml similarity index 100% rename from acm-addons/charts/grc/templates/grc-rolebinding.yaml rename to policy/charts/grc/templates/grc-rolebinding.yaml diff --git a/acm-addons/charts/grc/templates/grc-sa.yaml b/policy/charts/grc/templates/grc-sa.yaml similarity index 100% rename from acm-addons/charts/grc/templates/grc-sa.yaml rename to policy/charts/grc/templates/grc-sa.yaml diff --git a/acm-addons/charts/grc/templates/policyaddon-clusterrole.yaml b/policy/charts/grc/templates/policyaddon-clusterrole.yaml similarity index 100% rename from acm-addons/charts/grc/templates/policyaddon-clusterrole.yaml rename to policy/charts/grc/templates/policyaddon-clusterrole.yaml diff --git a/acm-addons/charts/grc/templates/policyaddon-clusterrolebinding.yaml b/policy/charts/grc/templates/policyaddon-clusterrolebinding.yaml similarity index 100% rename from acm-addons/charts/grc/templates/policyaddon-clusterrolebinding.yaml rename to policy/charts/grc/templates/policyaddon-clusterrolebinding.yaml diff --git a/acm-addons/charts/grc/values.yaml b/policy/charts/grc/values.yaml similarity index 100% rename from acm-addons/charts/grc/values.yaml rename to policy/charts/grc/values.yaml diff --git a/acm-addons/crds/agent.open-cluster-management.io_klusterletaddonconfigs_crd.yaml b/policy/crds/agent.open-cluster-management.io_klusterletaddonconfigs_crd.yaml similarity index 100% rename from acm-addons/crds/agent.open-cluster-management.io_klusterletaddonconfigs_crd.yaml rename to policy/crds/agent.open-cluster-management.io_klusterletaddonconfigs_crd.yaml diff --git a/acm-addons/crds/apps.open-cluster-management.io_placementrules_crd_v1.yaml b/policy/crds/apps.open-cluster-management.io_placementrules_crd_v1.yaml similarity index 100% rename from acm-addons/crds/apps.open-cluster-management.io_placementrules_crd_v1.yaml rename to policy/crds/apps.open-cluster-management.io_placementrules_crd_v1.yaml diff --git a/acm-addons/crds/policy.open-cluster-management.io_placementbindings.yaml b/policy/crds/policy.open-cluster-management.io_placementbindings.yaml similarity index 100% rename from acm-addons/crds/policy.open-cluster-management.io_placementbindings.yaml rename to policy/crds/policy.open-cluster-management.io_placementbindings.yaml diff --git a/acm-addons/crds/policy.open-cluster-management.io_policies.yaml b/policy/crds/policy.open-cluster-management.io_policies.yaml similarity index 100% rename from acm-addons/crds/policy.open-cluster-management.io_policies.yaml rename to policy/crds/policy.open-cluster-management.io_policies.yaml diff --git a/acm-addons/crds/policy.open-cluster-management.io_policyautomations.yaml b/policy/crds/policy.open-cluster-management.io_policyautomations.yaml similarity index 100% rename from acm-addons/crds/policy.open-cluster-management.io_policyautomations.yaml rename to policy/crds/policy.open-cluster-management.io_policyautomations.yaml diff --git a/acm-addons/crds/policy.open-cluster-management.io_policysets.yaml b/policy/crds/policy.open-cluster-management.io_policysets.yaml similarity index 100% rename from acm-addons/crds/policy.open-cluster-management.io_policysets.yaml rename to policy/crds/policy.open-cluster-management.io_policysets.yaml diff --git a/acm-addons/values.yaml b/policy/values.yaml similarity index 89% rename from acm-addons/values.yaml rename to policy/values.yaml index 12dcd9e..2f4a147 100644 --- a/acm-addons/values.yaml +++ b/policy/values.yaml @@ -1,6 +1,6 @@ global: registry: "quay.io/stolostron" - tag: "2.12.0-SNAPSHOT-2024-09-23-23-44-29" + tag: "2.12.0-SNAPSHOT-2024-09-24-23-38-54" imageOverrides: governance_policy_propagator: "" governance_policy_addon_controller: ""