diff --git a/manifests/composite/openstack/kustomization.yaml b/manifests/composite/openstack/kustomization.yaml index cf03e26..91b9168 100644 --- a/manifests/composite/openstack/kustomization.yaml +++ b/manifests/composite/openstack/kustomization.yaml @@ -1,5 +1,6 @@ resources: - - ../../function/memcached - ../../function/mariadb + - ../../function/memcached + - ../../function/ranger - namespace.yaml namespace: openstack diff --git a/manifests/composite/openstack/replacements/kustomization.yaml b/manifests/composite/openstack/replacements/kustomization.yaml index 6f7fc3b..47be49c 100644 --- a/manifests/composite/openstack/replacements/kustomization.yaml +++ b/manifests/composite/openstack/replacements/kustomization.yaml @@ -1,3 +1,4 @@ resources: - - ./../../../function/memcached/replacements - - ./../../../function/mariadb/replacements + - ../../../function/mariadb/replacements + - ../../../function/memcached/replacements + - ../../../function/ranger/replacements diff --git a/manifests/function/catalogues-openstack/versions-openstack.yaml b/manifests/function/catalogues-openstack/versions-openstack.yaml index c8a49e6..bed273a 100644 --- a/manifests/function/catalogues-openstack/versions-openstack.yaml +++ b/manifests/function/catalogues-openstack/versions-openstack.yaml @@ -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 diff --git a/manifests/function/mariadb/helmrelease.yaml b/manifests/function/mariadb/helmrelease.yaml index 4d29113..407e6a8 100644 --- a/manifests/function/mariadb/helmrelease.yaml +++ b/manifests/function/mariadb/helmrelease.yaml @@ -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: diff --git a/manifests/function/ranger/helmrelease.yaml b/manifests/function/ranger/helmrelease.yaml new file mode 100644 index 0000000..c6aa589 --- /dev/null +++ b/manifests/function/ranger/helmrelease.yaml @@ -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 diff --git a/manifests/function/ranger/helmrepository.yaml b/manifests/function/ranger/helmrepository.yaml new file mode 100644 index 0000000..5ca8a13 --- /dev/null +++ b/manifests/function/ranger/helmrepository.yaml @@ -0,0 +1,7 @@ +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: ranger +spec: + url: tarballs.opendev.org + interval: 10m diff --git a/manifests/function/ranger/kustomization.yaml b/manifests/function/ranger/kustomization.yaml new file mode 100644 index 0000000..b78047f --- /dev/null +++ b/manifests/function/ranger/kustomization.yaml @@ -0,0 +1,4 @@ +resources: + - helmrepository.yaml + - helmrelease.yaml +namespace: openstack diff --git a/manifests/function/ranger/replacements/kustomization.yaml b/manifests/function/ranger/replacements/kustomization.yaml new file mode 100644 index 0000000..1d43ee1 --- /dev/null +++ b/manifests/function/ranger/replacements/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - versions.yaml diff --git a/manifests/function/ranger/replacements/versions.yaml b/manifests/function/ranger/replacements/versions.yaml new file mode 100644 index 0000000..f821dfc --- /dev/null +++ b/manifests/function/ranger/replacements/versions.yaml @@ -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"] diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index cfcf1bc..31a1488 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -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 diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 5487182..26a7b5a 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -14,4 +14,4 @@ name: openstack-helm-deployments-single-16GB-bionic-node nodes: - name: primary - label: ubuntu-bionic-32GB + label: ubuntu-bionic-expanded