starlingx/openstack-armada-app
Code Issues Proposed changes

Update openstack-helm commit

Browse Source 
This commit is rebasing on upstream commit
7803000a545687ec40b0ddc41d46a6b377dea45f
and also remove some patches that were already
merged.
This change depends on the rebase of openstack-helm-infra made at
01f6571912

Patch 0005-Nova-Add-support-for-disabling-Readiness-Liveness-pr.patch
This patch was dropped because a feature that add this support was
implemented in 2020. It can be found on commit
af4e2aaadd

Patch 0007-Allow-more-generic-overrides-for-placeme.patch
Changes that this patch applies were already applied on commit
bdbea96326

Patch 0009-Disabling-helm3_hook.patch
Adding a helm3_hook in values.yaml file in case hooks needs
to be disabled

Patch 0011-Trust-public-ingress-certificate.patch
Removed in favor of using the openstack-helm implementation of tls
support. As we are dropping this patch we moved the changes to the
patch where the job is created. Commits can be found on
https://opendev.org/openstack/openstack-helm/commits/branch/master/search?q=feat%28tls%29

Patch 0012-Update-helm-tookit-dependencies-to-0.2.19.patch
Changes that this patch applies were already applied on commit
20b6b9a236

Due to changes implemented on 054affa290 (diff-9bd79f0fd832cb30fa4f4b6242b9059fbc0c81b30541b4243ff29cdf39bce621R63)
python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py
needed to be modified so the system overrides for the ceph client matches
the name of the internal ceph cluster we that StarlingX creates and the
deployment-cinder.yaml renders without issues.

We've change the endpoints on nova-api-proxy/templates/deployment.yaml
as in upstream openstack-helm deals with TLS internally, however in
starlingx there is a workaround that forces public endpoint for openstack
services. Although after some changes on openstack-helm that came with
this rebase and using cert-manager to generate all tls internal secrets
we dont need to do this anymore.

The volume mounts for dev-pts at
python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py
were removed since this problem was fixed upstream on 04d600c5b0

Story: 2009161
Task: 43150

Change-Id: Iaf7d4bf9aa80e1d5acacdfe24743d41d4e67a8c0

Signed-off-by: Arthur Luz de Avila <arthur.luzdeavila@windriver.com>
Signed-off-by: Lucas Cavalcante <lucasmedeiros.cavalcante@windriver.com>
Change-Id: Iaf7d4bf9aa80e1d5acacdfe24743d41d4e67a8c0
This commit is contained in:
Arthur Luz de Avila
2021-09-16 17:23:10 -03:00
committed by Arthur Luz de Ávila
parent 9a86882cda
commit aedbb8aa0c
20 changed files with 225 additions and 1941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py
View File

@@ -11,11 +11,13 @@ import tsconfig.tsconfig as tsc
from sysinv.common import constants
from sysinv.common import exception
from sysinv.common import utils
from sysinv.common.storage_backend_conf import StorageBackendConfig
from sysinv.common import storage_backend_conf
from sysinv.helm import common
ROOK_CEPH_BACKEND_NAME = 'ceph-store'
class CinderHelm(openstack.OpenstackBaseHelm):
"""Class to encapsulate helm operations for the cinder chart"""
@@ -45,10 +47,12 @@ class CinderHelm(openstack.OpenstackBaseHelm):
cinder_override = self._get_conf_rook_cinder_overrides()
ceph_override = self._get_conf_rook_ceph_overrides()
backend_override = self._get_conf_rook_backends_overrides()
ceph_client_override = self._get_ceph_client_rook_overrides()
else:
cinder_override = self._get_conf_cinder_overrides()
ceph_override = self._get_conf_ceph_overrides()
backend_override = self._get_conf_backends_overrides()
ceph_client_override = self._get_ceph_client_overrides()
overrides = {
common.HELM_NS_OPENSTACK: {
@@ -71,7 +75,7 @@ class CinderHelm(openstack.OpenstackBaseHelm):
'backends': backend_override,
},
'endpoints': self._get_endpoints_overrides(),
'ceph_client': self._get_ceph_client_overrides()
'ceph_client': ceph_client_override
}
}
@@ -91,8 +95,8 @@ class CinderHelm(openstack.OpenstackBaseHelm):
primary_tier_name =\
constants.SB_TIER_DEFAULT_NAMES[constants.SB_TIER_TYPE_CEPH]
replication, min_replication =\
StorageBackendConfig.get_ceph_pool_replication(self.dbapi)
replication, min_replication = storage_backend_conf\
.StorageBackendConfig.get_ceph_pool_replication(self.dbapi)
pools = {}
for backend in self.dbapi.storage_ceph_get_list():
@@ -325,9 +329,9 @@ class CinderHelm(openstack.OpenstackBaseHelm):
'volume_driver': ''
}
conf_backends['ceph-store'] = {
conf_backends[ROOK_CEPH_BACKEND_NAME] = {
'image_volume_cache_enabled': 'True',
'volume_backend_name': 'ceph-store',
'volume_backend_name': ROOK_CEPH_BACKEND_NAME,
'volume_driver': 'cinder.volume.drivers.rbd.RBDDriver',
'rbd_pool': 'cinder-volumes',
'rbd_user': 'cinder',
@@ -336,3 +340,20 @@ class CinderHelm(openstack.OpenstackBaseHelm):
constants.SB_TYPE_CEPH_CONF_FILENAME),
}
return conf_backends
def _get_ceph_client_rook_overrides(self):
return {
'user_secret_name': constants.K8S_RBD_PROV_ADMIN_SECRET_NAME,
'internal_ceph_backend': ROOK_CEPH_BACKEND_NAME,
}
def _get_ceph_client_overrides(self):
# A secret is required by the chart for ceph client access. Use the
# secret for the kube-rbd pool associated with the primary ceph tier
ceph_backend_name = constants.SB_DEFAULT_NAMES[constants.SB_TYPE_CEPH]
user_secret_name = storage_backend_conf.K8RbdProvisioner\
.get_user_secret_name({'name': ceph_backend_name})
return {
'user_secret_name': user_secret_name,
'internal_ceph_backend': ceph_backend_name,
}

12
python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py
View File

@@ -169,17 +169,7 @@ class NovaHelm(openstack.OpenstackBaseHelm):
return overrides
def _get_mount_overrides(self):
overrides = self._get_mount_uefi_overrides()
# mount /dev/pts in order to get console log
overrides['volumes'].append({
'name': 'dev-pts',
'hostPath': {'path': '/dev/pts'}
})
overrides['volumeMounts'].append({
'name': 'dev-pts',
'mountPath': '/dev/pts'
})
return overrides
return self._get_mount_uefi_overrides()
def _get_compute_ironic_manifests(self):
ironic_operator = self._operator.chart_operators[