From fbbcec4e6fa1fdcabd9ff155a6a040d7e551890e Mon Sep 17 00:00:00 2001 From: Pedro Almeida Date: Wed, 3 Aug 2022 09:57:14 -0300 Subject: [PATCH] Removing helm3 patches from osh(-i) on armada We are removing the patches that disables the helm3-hook osh(-i) uses to build an armada app because these patches are not necessary when building the fluxcd app. By removing the patches and changing the manifest.yaml, these hooks will only be disabled for the armada app, and the fluxcd app can be built as it is with [1]. [1] will add the stx-openstack-helm-fluxcd directory. This way, stx-openstack-helm will create the rpm with helm3-hook disabled and stx-openstack-helm-fluxcd will create the one with the hooks enabled (meaning no additional change nor patch will be necessary). Test Plan: PASS - Build all the packages necessary for the openstack app PASS - Create openstack tarball PASS - Apply/remove/delete openstack [1] I97402f9d4cacb2130118f49589b13b686d04e13b Signed-off-by: Pedro Almeida Change-Id: I6a1cb3832be8dc15930edc226e09a55f6f89951b --- .../centos/openstack-helm-infra.spec | 2 - .../files/0016-Disabling-helm3_hooks.patch | 40 ------ openstack-helm/centos/openstack-helm.spec | 2 - .../files/0008-Disabling-helm3_hook.patch | 130 ------------------ .../manifests/manifest.yaml | 10 ++ 5 files changed, 10 insertions(+), 174 deletions(-) delete mode 100644 openstack-helm-infra/files/0016-Disabling-helm3_hooks.patch delete mode 100644 openstack-helm/files/0008-Disabling-helm3_hook.patch diff --git a/openstack-helm-infra/centos/openstack-helm-infra.spec b/openstack-helm-infra/centos/openstack-helm-infra.spec index a62fe105..44ffcb2f 100644 --- a/openstack-helm-infra/centos/openstack-helm-infra.spec +++ b/openstack-helm-infra/centos/openstack-helm-infra.spec @@ -24,7 +24,6 @@ Patch09: 0009-Enable-override-of-mariadb-server-probe-parameters.patch Patch11: 0011-Add-mariadb-database-config-override-to-support-ipv6.patch Patch12: 0012-enable-Values.conf.database.config_override-for-mari.patch Patch13: 0013-Allow-set-public-endpoint-url-for-all-openstack-types.patch -Patch16: 0016-Disabling-helm3_hooks.patch Patch17: 0017-Enable-taint-toleration-for-Openstack-services.patch Patch18: 0018-Add-GaleraDB-Secure-Replica-Traffic.patch Patch19: 0019-Add-force_boot-command-to-rabbit-start-template.patch @@ -51,7 +50,6 @@ Openstack Helm Infra charts %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 diff --git a/openstack-helm-infra/files/0016-Disabling-helm3_hooks.patch b/openstack-helm-infra/files/0016-Disabling-helm3_hooks.patch deleted file mode 100644 index 2d2bae88..00000000 --- a/openstack-helm-infra/files/0016-Disabling-helm3_hooks.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 823eadb9068287c48121b9f3e1d63fee1d941493 Mon Sep 17 00:00:00 2001 -From: Thiago Brito -Date: Fri, 24 Sep 2021 21:52:43 -0300 -Subject: [PATCH] Disabling helm3_hooks - -Signed-off-by: Thiago Brito ---- - mariadb/values.yaml | 2 +- - rabbitmq/values.yaml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mariadb/values.yaml b/mariadb/values.yaml -index 0144f91b..be9b1f60 100644 ---- a/mariadb/values.yaml -+++ b/mariadb/values.yaml -@@ -635,7 +635,7 @@ network_policy: - - # Helm hook breaks for helm2. - # Set helm3_hook: false in case helm2 is used. --helm3_hook: true -+helm3_hook: false - - manifests: - certificates: false -diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml -index 9f0e83d5..d16ba167 100644 ---- a/rabbitmq/values.yaml -+++ b/rabbitmq/values.yaml -@@ -382,7 +382,7 @@ volume: - - # Hook break for helm2. - # Set helm3_hook to false while using helm2 --helm3_hook: true -+helm3_hook: false - - io_thread_pool: - enabled: false --- -2.17.1 - diff --git a/openstack-helm/centos/openstack-helm.spec b/openstack-helm/centos/openstack-helm.spec index 0b14baef..56f0995b 100644 --- a/openstack-helm/centos/openstack-helm.spec +++ b/openstack-helm/centos/openstack-helm.spec @@ -26,7 +26,6 @@ Patch04: 0004-Support-ingress-creation-for-keystone-admin-endpoint.patch Patch05: 0005-Allow-set-public-endpoint-url-for-keystone-endpoints.patch Patch06: 0006-Wrong-usage-of-rbd_store_chunk_size.patch Patch07: 0007-Add-stx_admin-account.patch -Patch08: 0008-Disabling-helm3_hook.patch Patch09: 0009-Add-flavor-extra-spec-hw-pci_irq_affinity_mask.patch Patch10: 0010-Enable-taint-toleration-for-Openstack-services.patch Patch11: 0011-Fix-nova-compute-ssh-init-to-execute-as-runAsUser.patch @@ -54,7 +53,6 @@ Openstack Helm charts %patch05 -p1 %patch06 -p1 %patch07 -p1 -%patch08 -p1 %patch09 -p1 %patch10 -p1 %patch11 -p1 diff --git a/openstack-helm/files/0008-Disabling-helm3_hook.patch b/openstack-helm/files/0008-Disabling-helm3_hook.patch deleted file mode 100644 index 12b7646e..00000000 --- a/openstack-helm/files/0008-Disabling-helm3_hook.patch +++ /dev/null @@ -1,130 +0,0 @@ -198597ee329c4c205f8852779e6a49 Mon Sep 17 00:00:00 2001 -From: Thiago Brito -Date: Mon, 4 Oct 2021 10:04:21 -0300 -Subject: [PATCH] Disabling helm3_hook - -Since openstack-helm now defaults to use helmv3 hooks, this -changes disables it to maintain compatibility with the helm -version in use on StarlingX. - -Signed-off-by: Thiago Brito -Change-Id: I2a343805be2bb20f39b2dd8cc8d2e8716961ea28 ---- - barbican/values.yaml | 2 +- - cinder/values.yaml | 2 +- - glance/values.yaml | 2 +- - heat/values.yaml | 2 +- - keystone/values.yaml | 2 +- - neutron/values.yaml | 2 +- - nova/values.yaml | 2 +- - placement/values.yaml | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/barbican/values.yaml b/barbican/values.yaml -index 72efd88c..44d3b76b 100644 ---- a/barbican/values.yaml -+++ b/barbican/values.yaml -@@ -31,7 +31,7 @@ release_group: null - - # NOTE(philsphicas): the pre-install hook breaks upgrade for helm2 - # Set to false to upgrade using helm2 --helm3_hook: true -+helm3_hook: false - - images: - tags: -diff --git a/cinder/values.yaml b/cinder/values.yaml -index a70ed72a..30a2e47a 100644 ---- a/cinder/values.yaml -+++ b/cinder/values.yaml -@@ -1516,7 +1516,7 @@ network_policy: - - # NOTE(helm_hook): helm_hook might break for helm2 binary. - # set helm3_hook: false when using the helm2 binary. --helm3_hook: true -+helm3_hook: false - - manifests: - certificates: false -diff --git a/glance/values.yaml b/glance/values.yaml -index a03a69a1..459f04bc 100644 ---- a/glance/values.yaml -+++ b/glance/values.yaml -@@ -1052,7 +1052,7 @@ pod: - - # NOTE(helm_hook): helm_hook might break for helm2 binary. - # set helm3_hook: false when using the helm2 binary. --helm3_hook: true -+helm3_hook: false - - manifests: - certificates: false -diff --git a/heat/values.yaml b/heat/values.yaml -index 58f786b6..9e9ea64b 100644 ---- a/heat/values.yaml -+++ b/heat/values.yaml -@@ -1293,7 +1293,7 @@ network_policy: - - # NOTE(helm_hook): helm_hook might break for helm2 binary. - # set helm3_hook: false when using the helm2 binary. --helm3_hook: true -+helm3_hook: false - - manifests: - certificates: false -diff --git a/keystone/values.yaml b/keystone/values.yaml -index ff4493f3..84b8fe48 100644 ---- a/keystone/values.yaml -+++ b/keystone/values.yaml -@@ -31,7 +31,7 @@ release_group: null - - # NOTE(gagehugo): the pre-install hook breaks upgrade for helm2 - # Set to false to upgrade using helm2 --helm3_hook: true -+helm3_hook: false - - images: - tags: -diff --git a/neutron/values.yaml b/neutron/values.yaml -index c72a55b5..6073c6a3 100644 ---- a/neutron/values.yaml -+++ b/neutron/values.yaml -@@ -2514,7 +2514,7 @@ network_policy: - egress: - - {} - --helm3_hook: true -+helm3_hook: false - - manifests: - certificates: false -diff --git a/nova/values.yaml b/nova/values.yaml -index 6b51b3d5..56f1dc9a 100644 ---- a/nova/values.yaml -+++ b/nova/values.yaml -@@ -2563,7 +2563,7 @@ network_policy: - - # NOTE(helm_hook): helm_hook might break for helm2 binary. - # set helm3_hook: false when using the helm2 binary. --helm3_hook: true -+helm3_hook: false - - manifests: - certificates: false -diff --git a/placement/values.yaml b/placement/values.yaml -index 57d9eb48..2811b200 100644 ---- a/placement/values.yaml -+++ b/placement/values.yaml -@@ -485,7 +485,7 @@ dependencies: - - # NOTE(helm_hook): helm_hook might break for helm2 binary. - # set helm3_hook: false when using the helm2 binary. --helm3_hook: true -+helm3_hook: false - - manifests: - certificates: false --- -2.17.1 - - diff --git a/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml b/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml index cd311a25..501c08e2 100644 --- a/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml +++ b/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml @@ -161,6 +161,7 @@ data: labels: release_group: osh-openstack-mariadb values: + helm3_hook: false manifests: pod_test: false monitoring: @@ -351,6 +352,7 @@ data: release_group: osh-openstack-rabbitmq component: test values: + helm3_hook: false forceBoot: enabled: true monitoring: @@ -435,6 +437,7 @@ data: release_group: osh-openstack-keystone component: test values: + helm3_hook: false manifests: job_credential_cleanup: false endpoints: @@ -628,6 +631,7 @@ data: release_group: osh-openstack-barbican component: test values: + helm3_hook: false labels: api: node_selector_key: openstack-control-plane @@ -805,6 +809,7 @@ data: release_group: osh-openstack-glance component: test values: + helm3_hook: false labels: api: node_selector_key: openstack-control-plane @@ -923,6 +928,7 @@ data: release_group: osh-openstack-cinder component: test values: + helm3_hook: false labels: api: node_selector_key: openstack-control-plane @@ -1131,6 +1137,7 @@ data: labels: release_group: osh-openstack-nova values: + helm3_hook: false endpoints: oslo_messaging: statefulset: @@ -1414,6 +1421,7 @@ data: labels: release_group: osh-openstack-placement values: + helm3_hook: false endpoints: identity: force_public_endpoint: true @@ -1646,6 +1654,7 @@ data: labels: release_group: osh-openstack-neutron values: + helm3_hook: false endpoints: oslo_messaging: statefulset: @@ -2047,6 +2056,7 @@ data: release_group: osh-openstack-heat component: test values: + helm3_hook: false endpoints: oslo_messaging: statefulset: