openstack/openstack-helm-deployments
Code Issues Proposed changes

Feature: Enable Ranger Service Deployment

Browse Source 
Enable ranger service to be deployed using
kustomize documents via airshipctl

Also fixes some issues with mariadb deployment
which prevented mariadb ingress from
deploying endpoints due to the need to
override node selector keys.

Change-Id: I934481c05b9e557e7317878a6b003a6c57e54b40
This commit is contained in:
jh629g
2020-12-02 15:39:19 -06:00
committed by Jeremy Houser
parent c503df71cd
commit c1615d9516
11 changed files with 152 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/composite/openstack/kustomization.yaml
View File

@@ -1,5 +1,6 @@
resources:
- ../../function/memcached
- ../../function/mariadb
- ../../function/memcached
- ../../function/ranger
- namespace.yaml
namespace: openstack

5
manifests/composite/openstack/replacements/kustomization.yaml
View File

@@ -1,3 +1,4 @@
resources:
- ./../../../function/memcached/replacements
- ./../../../function/mariadb/replacements
- ../../../function/mariadb/replacements
- ../../../function/memcached/replacements
- ../../../function/ranger/replacements

31
manifests/function/catalogues-openstack/versions-openstack.yaml
View File

@@ -5,24 +5,39 @@ metadata:
labels:
airshipit.org/deploy-k8s: "false"
charts:
mariadb:
repository: https://tarballs.opendev.org/openstack/openstack-helm-infra
name: mariadb
version: 0.1.7
memcached:
repository: https://tarballs.opendev.org/openstack/openstack-helm-infra
name: memcached
version: 0.1.1
mariadb:
repository: https://tarballs.opendev.org/openstack/openstack-helm-infra
name: mariadb
ranger:
repository: https://tarballs.opendev.org/openstack/openstack-helm-addons
name: ranger
version: 0.1.4
images:
mariadb:
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_xenial
ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
error_pages: k8s.gcr.io/defaultbackend:1.4
prometheus_create_mysql_user: docker.io/mariadb:10.2.31
prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.11.0
prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial
image_repo_sync: docker.io/docker:17.07.0
memcached:
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
memcached: docker.io/memcached:1.5.5
prometheus_memcached_exporter: docker.io/prom/memcached-exporter:v0.4.1
image_repo_sync: docker.io/docker:17.07.0
mariadb:
ranger:
db_drop: docker.io/openstackhelm/heat:newton-ubuntu_xenial
db_init: docker.io/openstackhelm/heat:newton-ubuntu_xenial
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_xenial
prometheus_create_mysql_user: docker.io/mariadb:10.2.31
prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.11.0
prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial
image_repo_sync: docker.io/docker:17.07.0
ranger: quay.io/attcomdev/ranger:30ccde094baf556e885b0ee5f9d51126d8a423bc
ranger_db_sync: quay.io/attcomdev/ranger:30ccde094baf556e885b0ee5f9d51126d8a423bc
scripted_test: docker.io/openstackhelm/heat:newton-ubuntu_xenial

14
manifests/function/mariadb/helmrelease.yaml
View File

@@ -6,7 +6,7 @@ spec:
chart:
spec:
chart: mariadb
version: 0.1.4
version: 0.1.7
sourceRef:
kind: HelmRepository
name: mariadb
@@ -16,12 +16,24 @@ spec:
prometheus:
enabled: false
labels:
test:
node_selector_key: kubernetes.io/os
node_selector_value: linux
job:
node_selector_key: kubernetes.io/os
node_selector_value: linux
server:
node_selector_key: kubernetes.io/os
node_selector_value: linux
ingress:
node_selector_key: kubernetes.io/os
node_selector_value: linux
prometheus_mysql_exporter:
node_selector_key: kubernetes.io/os
node_selector_value: linux
error_server:
node_selector_key: kubernetes.io/os
node_selector_value: linux
volume:
enabled: false
use_local_path_for_single_pod_cluster:

55
manifests/function/ranger/helmrelease.yaml Normal file
View File

@@ -0,0 +1,55 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
name: ranger
spec:
chart:
spec:
chart: ranger
version: 0.1.4
sourceRef:
kind: HelmRepository
name: ranger
ranger:
enable: false
interval: 4m
timeout: 10m
wait: true
values:
labels:
job:
node_selector_key: kubernetes.io/os
node_selector_value: linux
test:
node_selector_key: kubernetes.io/os
node_selector_value: linux
uuid:
node_selector_key: kubernetes.io/os
node_selector_value: linux
audit:
node_selector_key: kubernetes.io/os
node_selector_value: linux
cms:
node_selector_key: kubernetes.io/os
node_selector_value: linux
fms:
node_selector_key: kubernetes.io/os
node_selector_value: linux
ims:
node_selector_key: kubernetes.io/os
node_selector_value: linux
rds:
node_selector_key: kubernetes.io/os
node_selector_value: linux
rms:
node_selector_key: kubernetes.io/os
node_selector_value: linux
pod:
replicas:
uuid: 1
audit: 1
cms: 1
fms: 1
ims: 1
rds: 1
rms: 1

7
manifests/function/ranger/helmrepository.yaml Normal file
View File

@@ -0,0 +1,7 @@
apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: HelmRepository
metadata:
name: ranger
spec:
url: tarballs.opendev.org
interval: 10m

4
manifests/function/ranger/kustomization.yaml Normal file
View File

@@ -0,0 +1,4 @@
resources:
- helmrepository.yaml
- helmrelease.yaml
namespace: openstack

4
manifests/function/ranger/replacements/kustomization.yaml Normal file
View File

@@ -0,0 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- versions.yaml

39
manifests/function/ranger/replacements/versions.yaml Normal file
View File

@@ -0,0 +1,39 @@
apiVersion: airshipit.org/v1alpha1
kind: ReplacementTransformer
metadata:
name: ranger-versions-replacements
annotations:
config.kubernetes.io/function: |-
container:
image: quay.io/airshipit/replacement-transformer:latest
replacements:
- source:
objref:
kind: VariableCatalogue
name: versions-openstack
fieldref: charts.ranger.repository
target:
objref:
kind: HelmRepository
name: ranger
fieldrefs: ["spec.url"]
- source:
objref:
kind: VariableCatalogue
name: versions-openstack
fieldref: charts.ranger.name
target:
objref:
kind: HelmRelease
name: ranger
fieldrefs: ["spec.chart.spec.chart"]
- source:
objref:
kind: VariableCatalogue
name: versions-openstack
fieldref: charts.ranger.version
target:
objref:
kind: HelmRelease
name: ranger
fieldrefs: ["spec.chart.spec.version"]

2
zuul.d/jobs.yaml
View File

@@ -39,7 +39,7 @@
- ./tools/deployment/23_pull_documents.sh
- ./tools/deployment/24_build_images.sh
- ./tools/deployment/25_deploy_ephemeral_node.sh
- ./tools/deployment/26_deploy_metal3_capi_ephemeral_node.sh
- ./tools/deployment/26_deploy_capi_ephemeral_node.sh
- ./tools/deployment/30_deploy_controlplane.sh
- ./tools/deployment/31_deploy_initinfra_target_node.sh
- ./tools/deployment/32_cluster_init_target_node.sh

2
zuul.d/nodesets.yaml
View File

@@ -14,4 +14,4 @@
name: openstack-helm-deployments-single-16GB-bionic-node
nodes:
- name: primary
label: ubuntu-bionic-32GB
label: ubuntu-bionic-expanded