openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Use predefined Helm repo in deployment scripts"

Browse Source
This commit is contained in:
Zuul 2024-07-19 23:00:53 +00:00 committed by Gerrit Code Review
commit da5157ae76
27 changed files with 103 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/deployment/ceph/ceph-radosgw.sh
View File

@ -14,7 +14,9 @@
set -xe set -xe
: ${OSH_EXTRA_HELM_ARGS_CEPH_RGW:="$(helm osh get-values-overrides -c ceph-rgw ${FEATURES})"} : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS_CEPH_RGW:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c ceph-rgw ${FEATURES})"}
#NOTE: Deploy command #NOTE: Deploy command
tee /tmp/radosgw-osh-infra.yaml <<EOF tee /tmp/radosgw-osh-infra.yaml <<EOF
@ -46,7 +48,7 @@ manifests:
job_bootstrap: true job_bootstrap: true
EOF EOF
helm upgrade --install radosgw-osh-infra ./ceph-rgw \ helm upgrade --install radosgw-osh-infra ${OSH_INFRA_HELM_REPO}/ceph-rgw \
--namespace=osh-infra \ --namespace=osh-infra \
--values=/tmp/radosgw-osh-infra.yaml \ --values=/tmp/radosgw-osh-infra.yaml \
${OSH_EXTRA_HELM_ARGS:=} \ ${OSH_EXTRA_HELM_ARGS:=} \

6
tools/deployment/common/daemonjob-controller.sh
View File

@ -14,10 +14,12 @@
set -xe set -xe
namespace="metacontroller" namespace="metacontroller"
: ${HELM_ARGS_DAEMONJOB_CONTROLLER:="$(helm osh get-values-overrides -c daemonjob-controller ${FEATURES})"} : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${HELM_ARGS_DAEMONJOB_CONTROLLER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c daemonjob-controller ${FEATURES})"}
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install daemonjob-controller ./daemonjob-controller \ helm upgrade --install daemonjob-controller ${OSH_INFRA_HELM_REPO}/daemonjob-controller \
--namespace=$namespace \ --namespace=$namespace \
--set pod.replicas.daemonjob_controller=4 \ --set pod.replicas.daemonjob_controller=4 \
${HELM_ARGS_DAEMONJOB_CONTROLLER} ${HELM_ARGS_DAEMONJOB_CONTROLLER}

8
tools/deployment/common/deploy-docker-registry.sh
View File

@ -14,6 +14,8 @@
set -xe set -xe
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
for NAMESPACE in docker-nfs docker-registry; do for NAMESPACE in docker-nfs docker-registry; do
tee /tmp/${NAMESPACE}-ns.yaml << EOF tee /tmp/${NAMESPACE}-ns.yaml << EOF
apiVersion: v1 apiVersion: v1
@ -37,11 +39,11 @@ storageclass:
name: openstack-helm-bootstrap name: openstack-helm-bootstrap
EOF EOF
helm upgrade --install docker-registry-nfs-provisioner \ helm upgrade --install docker-registry-nfs-provisioner \
./nfs-provisioner --namespace=docker-nfs \ ${OSH_INFRA_HELM_REPO}/nfs-provisioner --namespace=docker-nfs \
--values=/tmp/docker-registry-nfs-provisioner.yaml --values=/tmp/docker-registry-nfs-provisioner.yaml
#NOTE: Deploy redis for the docker registry #NOTE: Deploy redis for the docker registry
helm upgrade --install docker-registry-redis ./redis \ helm upgrade --install docker-registry-redis ${OSH_INFRA_HELM_REPO}/redis \
--namespace=docker-registry \ --namespace=docker-registry \
--set labels.node_selector_key=openstack-helm-node-class \ --set labels.node_selector_key=openstack-helm-node-class \
--set labels.node_selector_value=primary --set labels.node_selector_value=primary
@ -54,7 +56,7 @@ labels:
volume: volume:
class_name: openstack-helm-bootstrap class_name: openstack-helm-bootstrap
EOF EOF
helm upgrade --install docker-registry ./registry \ helm upgrade --install docker-registry ${OSH_INFRA_HELM_REPO}/registry \
--namespace=docker-registry \ --namespace=docker-registry \
--values=/tmp/docker-registry.yaml --values=/tmp/docker-registry.yaml

4
tools/deployment/common/falco.sh
View File

@ -14,8 +14,10 @@
set -xe set -xe
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install falco ./falco \ helm upgrade --install falco ${OSH_INFRA_HELM_REPO}/falco \
--namespace=kube-system --namespace=kube-system
#NOTE: Wait for deploy #NOTE: Wait for deploy

6
tools/deployment/common/ldap.sh
View File

@ -14,11 +14,13 @@
set -xe set -xe
: ${OSH_INFRA_EXTRA_HELM_ARGS_LDAP:="$(helm osh get-values-overrides -c ldap ${FEATURES})"} : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_LDAP:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c ldap ${FEATURES})"}
: ${NAMESPACE:="osh-infra"} : ${NAMESPACE:="osh-infra"}
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install ldap ./ldap \ helm upgrade --install ldap ${OSH_INFRA_HELM_REPO}/ldap \
--namespace=${NAMESPACE} \ --namespace=${NAMESPACE} \
--set bootstrap.enabled=true \ --set bootstrap.enabled=true \
${OSH_INFRA_EXTRA_HELM_ARGS:=} \ ${OSH_INFRA_EXTRA_HELM_ARGS:=} \

6
tools/deployment/common/metacontroller.sh
View File

@ -14,7 +14,9 @@
set -xe set -xe
namespace="metacontroller" namespace="metacontroller"
: ${HELM_ARGS_METACONTROLLER:="$(helm osh get-values-overrides -c metacontroller ${FEATURES})"} : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${HELM_ARGS_METACONTROLLER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c metacontroller ${FEATURES})"}
#NOTE: Check no crd exists of APIGroup metacontroller.k8s.io #NOTE: Check no crd exists of APIGroup metacontroller.k8s.io
crds=$(kubectl get crd | awk '/metacontroller.k8s.io/{print $1}') crds=$(kubectl get crd | awk '/metacontroller.k8s.io/{print $1}')
@ -36,7 +38,7 @@ EOF
kubectl create -f /tmp/${namespace}-ns.yaml kubectl create -f /tmp/${namespace}-ns.yaml
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install metacontroller ./metacontroller \ helm upgrade --install metacontroller ${OSH_INFRA_HELM_REPO}/metacontroller \
--namespace=$namespace \ --namespace=$namespace \
--set pod.replicas.metacontroller=3 \ --set pod.replicas.metacontroller=3 \
${HELM_ARGS_METACONTROLLER} ${HELM_ARGS_METACONTROLLER}

4
tools/deployment/common/namespace-config.sh
View File

@ -14,8 +14,10 @@
set -xe set -xe
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
#NOTE: Deploy namespace configs #NOTE: Deploy namespace configs
for NAMESPACE in kube-system ceph openstack; do for NAMESPACE in kube-system ceph openstack; do
helm upgrade --install ${NAMESPACE}-namespace-config ./namespace-config \ helm upgrade --install ${NAMESPACE}-namespace-config ${OSH_INFRA_HELM_REPO}/namespace-config \
--namespace=${NAMESPACE} --namespace=${NAMESPACE}
done done

4
tools/deployment/common/nfs-provisioner.sh
View File

@ -14,6 +14,8 @@
set -xe set -xe
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
tee /tmp/nfs-ns.yaml << EOF tee /tmp/nfs-ns.yaml << EOF
apiVersion: v1 apiVersion: v1
kind: Namespace kind: Namespace
@ -35,7 +37,7 @@ storageclass:
name: general name: general
EOF EOF
helm upgrade --install nfs-provisioner \ helm upgrade --install nfs-provisioner \
./nfs-provisioner --namespace=nfs \ ${OSH_INFRA_HELM_REPO}/nfs-provisioner --namespace=nfs \
--values=/tmp/nfs-provisioner.yaml --values=/tmp/nfs-provisioner.yaml
#NOTE: Wait for deployment #NOTE: Wait for deployment

4
tools/deployment/db/mariadb-backup.sh
View File

@ -14,10 +14,12 @@
set -xe set -xe
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_BACKUP:="$(helm osh get-values-overrides -c mariadb-backup ${FEATURES})"} : ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_BACKUP:="$(helm osh get-values-overrides -c mariadb-backup ${FEATURES})"}
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install mariadb-backup ./mariadb-backup \ helm upgrade --install mariadb-backup ${OSH_INFRA_HELM_REPO}/mariadb-backup \
--namespace=openstack \ --namespace=openstack \
--wait \ --wait \
--timeout 900s \ --timeout 900s \

6
tools/deployment/db/mariadb-operator-cluster.sh
View File

@ -24,12 +24,14 @@ helm upgrade --install mariadb-operator mariadb-operator/mariadb-operator --vers
#NOTE: Wait for deploy #NOTE: Wait for deploy
helm osh wait-for-pods mariadb-operator helm osh wait-for-pods mariadb-operator
: ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_CLUSTER:="$(helm osh get-values-overrides -c mariadb-cluster ${FEATURES})"} : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_CLUSTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c mariadb-cluster ${FEATURES})"}
#NOTE: Deploy command #NOTE: Deploy command
# Deploying downscaled cluster # Deploying downscaled cluster
: ${OSH_INFRA_EXTRA_HELM_ARGS:=""} : ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
helm upgrade --install mariadb-cluster ./mariadb-cluster \ helm upgrade --install mariadb-cluster ${OSH_INFRA_HELM_REPO}/mariadb-cluster \
--namespace=openstack \ --namespace=openstack \
--wait \ --wait \
--timeout 900s \ --timeout 900s \

2
tools/deployment/db/mariadb.sh
View File

@ -21,7 +21,7 @@ set -xe
: ${RUN_HELM_TESTS:="yes"} : ${RUN_HELM_TESTS:="yes"}
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install mariadb ./mariadb \ helm upgrade --install mariadb ${OSH_INFRA_HELM_REPO}/mariadb \
--namespace=${NAMESPACE} \ --namespace=${NAMESPACE} \
${MONITORING_HELM_ARGS:="--set monitoring.prometheus.enabled=true"} \ ${MONITORING_HELM_ARGS:="--set monitoring.prometheus.enabled=true"} \
${OSH_INFRA_EXTRA_HELM_ARGS:=} \ ${OSH_INFRA_EXTRA_HELM_ARGS:=} \

6
tools/deployment/db/postgresql.sh
View File

@ -15,10 +15,12 @@
set -xe set -xe
#NOTE: Deploy command #NOTE: Deploy command
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS:=""} : ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
: ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL:="$(helm osh get-values-overrides -c postgresql ${FEATURES})"} : ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c postgresql ${FEATURES})"}
helm upgrade --install postgresql ./postgresql \ helm upgrade --install postgresql ${OSH_INFRA_HELM_REPO}/postgresql \
--namespace=osh-infra \ --namespace=osh-infra \
--set monitoring.prometheus.enabled=true \ --set monitoring.prometheus.enabled=true \
--set storage.pvc.size=1Gi \ --set storage.pvc.size=1Gi \

6
tools/deployment/logging/elasticsearch.sh
View File

@ -173,9 +173,11 @@ images:
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
EOF EOF
: ${OSH_INFRA_EXTRA_HELM_ARGS_ELASTICSEARCH:="$(helm osh get-values-overrides -c elasticsearch ${FEATURES})"} : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_ELASTICSEARCH:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c elasticsearch ${FEATURES})"}
helm upgrade --install elasticsearch ./elasticsearch \ helm upgrade --install elasticsearch ${OSH_INFRA_HELM_REPO}/elasticsearch \
--namespace=osh-infra \ --namespace=osh-infra \
--values=/tmp/elasticsearch.yaml\ --values=/tmp/elasticsearch.yaml\
${OSH_INFRA_EXTRA_HELM_ARGS} \ ${OSH_INFRA_EXTRA_HELM_ARGS} \

6
tools/deployment/logging/fluentbit.sh
View File

@ -14,9 +14,11 @@
set -xe set -xe
: ${OSH_INFRA_EXTRA_HELM_ARGS_FLUENTBIT:="$(helm osh get-values-overrides -c fluentbit ${FEATURES})"} : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_FLUENTBIT:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c fluentbit ${FEATURES})"}
helm upgrade --install fluentbit ./fluentbit \ helm upgrade --install fluentbit ${OSH_INFRA_HELM_REPO}/fluentbit \
--namespace=osh-infra \ --namespace=osh-infra \
${OSH_INFRA_EXTRA_HELM_ARGS:=} \ ${OSH_INFRA_EXTRA_HELM_ARGS:=} \
${OSH_INFRA_EXTRA_HELM_ARGS_FLUENTBIT} ${OSH_INFRA_EXTRA_HELM_ARGS_FLUENTBIT}

6
tools/deployment/logging/fluentd.sh
View File

@ -14,7 +14,9 @@
set -xe set -xe
: ${OSH_INFRA_EXTRA_HELM_ARGS_FLUENTD:="$(helm osh get-values-overrides -c fluentd ${FEATURES})"} : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_FLUENTD:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c fluentd ${FEATURES})"}
tee /tmp/fluentd.yaml << EOF tee /tmp/fluentd.yaml << EOF
pod: pod:
@ -224,7 +226,7 @@ conf:
</match> </match>
</label> </label>
EOF EOF
helm upgrade --install fluentd ./fluentd \ helm upgrade --install fluentd ${OSH_INFRA_HELM_REPO}/fluentd \
--namespace=osh-infra \ --namespace=osh-infra \
--values=/tmp/fluentd.yaml \ --values=/tmp/fluentd.yaml \
${OSH_INFRA_EXTRA_HELM_ARGS} \ ${OSH_INFRA_EXTRA_HELM_ARGS} \

6
tools/deployment/logging/kibana.sh
View File

@ -14,10 +14,12 @@
set -xe set -xe
: ${OSH_INFRA_EXTRA_HELM_ARGS_KIBANA:="$(helm osh get-values-overrides -c kibana ${FEATURES})"} : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_KIBANA:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c kibana ${FEATURES})"}
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install kibana ./kibana \ helm upgrade --install kibana ${OSH_INFRA_HELM_REPO}/kibana \
--namespace=osh-infra \ --namespace=osh-infra \
--set network.kibana.ingress.classes.namespace=nginx-osh-infra \ --set network.kibana.ingress.classes.namespace=nginx-osh-infra \
${OSH_INFRA_EXTRA_HELM_ARGS} \ ${OSH_INFRA_EXTRA_HELM_ARGS} \

4
tools/deployment/monitoring/alertmanager.sh
View File

@ -14,8 +14,10 @@
set -xe set -xe
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install prometheus-alertmanager ./prometheus-alertmanager \ helm upgrade --install prometheus-alertmanager ${OSH_INFRA_HELM_REPO}/prometheus-alertmanager \
--namespace=osh-infra \ --namespace=osh-infra \
--set pod.replicas.alertmanager=1 --set pod.replicas.alertmanager=1

4
tools/deployment/monitoring/blackbox-exporter.sh
View File

@ -14,9 +14,11 @@
set -xe set -xe
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install prometheus-blackbox-exporter \ helm upgrade --install prometheus-blackbox-exporter \
./prometheus-blackbox-exporter --namespace=osh-infra ${OSH_INFRA_HELM_REPO}/prometheus-blackbox-exporter --namespace=osh-infra
#NOTE: Wait for deploy #NOTE: Wait for deploy
helm osh wait-for-pods osh-infra helm osh wait-for-pods osh-infra

6
tools/deployment/monitoring/grafana.sh
View File

@ -14,11 +14,13 @@
set -xe set -xe
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
FEATURE_GATES="calico ceph containers coredns elasticsearch kubernetes nginx nodes openstack prometheus home_dashboard persistentvolume apparmor" FEATURE_GATES="calico ceph containers coredns elasticsearch kubernetes nginx nodes openstack prometheus home_dashboard persistentvolume apparmor"
: ${OSH_INFRA_EXTRA_HELM_ARGS_GRAFANA:=$(helm osh get-values-overrides -c grafana ${FEATURE_GATES} ${FEATURES} 2>/dev/null)} : ${OSH_INFRA_EXTRA_HELM_ARGS_GRAFANA:=$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c grafana ${FEATURE_GATES} ${FEATURES} 2>/dev/null)}
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install grafana ./grafana \ helm upgrade --install grafana ${OSH_INFRA_HELM_REPO}/grafana \
--namespace=osh-infra \ --namespace=osh-infra \
${OSH_INFRA_EXTRA_HELM_ARGS:=} \ ${OSH_INFRA_EXTRA_HELM_ARGS:=} \
${OSH_INFRA_EXTRA_HELM_ARGS_GRAFANA} ${OSH_INFRA_EXTRA_HELM_ARGS_GRAFANA}

8
tools/deployment/monitoring/kube-state-metrics.sh
View File

@ -14,11 +14,13 @@
set -xe set -xe
#NOTE: Deploy command : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_STATE_METRICS:="$(helm osh get-values-overrides -c prometheus-kube-state-metrics ${FEATURES})"} : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_STATE_METRICS:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-kube-state-metrics ${FEATURES})"}
#NOTE: Deploy command
helm upgrade --install prometheus-kube-state-metrics \ helm upgrade --install prometheus-kube-state-metrics \
./prometheus-kube-state-metrics --namespace=kube-system \ ${OSH_INFRA_HELM_REPO}/prometheus-kube-state-metrics --namespace=kube-system \
${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_STATE_METRICS} ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_STATE_METRICS}
#NOTE: Wait for deploy #NOTE: Wait for deploy

6
tools/deployment/monitoring/mysql-exporter.sh
View File

@ -14,10 +14,12 @@
set -xe set -xe
: ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_MYSQL_EXPORTER:="$(helm osh get-values-overrides -c prometheus-mysql-exporter ${FEATURES})"} : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_MYSQL_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-mysql-exporter ${FEATURES})"}
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install prometheus-mysql-exporter ./prometheus-mysql-exporter \ helm upgrade --install prometheus-mysql-exporter ${OSH_INFRA_HELM_REPO}/prometheus-mysql-exporter \
--namespace=openstack \ --namespace=openstack \
--wait \ --wait \
--timeout 900s \ --timeout 900s \

6
tools/deployment/monitoring/nagios.sh
View File

@ -14,10 +14,12 @@
set -xe set -xe
: ${OSH_INFRA_EXTRA_HELM_ARGS_NAGIOS:="$(helm osh get-values-overrides -c nagios ${FEATURES})"} : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_NAGIOS:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c nagios ${FEATURES})"}
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install nagios ./nagios \ helm upgrade --install nagios ${OSH_INFRA_HELM_REPO}/nagios \
--namespace=osh-infra \ --namespace=osh-infra \
${OSH_INFRA_EXTRA_HELM_ARGS:=} \ ${OSH_INFRA_EXTRA_HELM_ARGS:=} \
${OSH_INFRA_EXTRA_HELM_ARGS_NAGIOS} ${OSH_INFRA_EXTRA_HELM_ARGS_NAGIOS}

8
tools/deployment/monitoring/node-exporter.sh
View File

@ -14,11 +14,13 @@
set -xe set -xe
#NOTE: Deploy command : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_NODE_EXPORTER:="$(helm osh get-values-overrides -c prometheus-node-exporter ${FEATURES})"} : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_NODE_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-node-exporter ${FEATURES})"}
#NOTE: Deploy command
helm upgrade --install prometheus-node-exporter \ helm upgrade --install prometheus-node-exporter \
./prometheus-node-exporter --namespace=kube-system \ ${OSH_INFRA_HELM_REPO}/prometheus-node-exporter --namespace=kube-system \
${OSH_INFRA_EXTRA_HELM_ARGS_NODE_EXPORTER} ${OSH_INFRA_EXTRA_HELM_ARGS_NODE_EXPORTER}
#NOTE: Wait for deploy #NOTE: Wait for deploy

4
tools/deployment/monitoring/node-problem-detector.sh
View File

@ -13,6 +13,8 @@
set -xe set -xe
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
#NOTE: Deploy command #NOTE: Deploy command
tee /tmp/kubernetes-node-problem-detector.yaml << EOF tee /tmp/kubernetes-node-problem-detector.yaml << EOF
monitoring: monitoring:
@ -25,7 +27,7 @@ manifests:
service: true service: true
EOF EOF
helm upgrade --install kubernetes-node-problem-detector \ helm upgrade --install kubernetes-node-problem-detector \
./kubernetes-node-problem-detector --namespace=kube-system \ ${OSH_INFRA_HELM_REPO}/kubernetes-node-problem-detector --namespace=kube-system \
--values=/tmp/kubernetes-node-problem-detector.yaml --values=/tmp/kubernetes-node-problem-detector.yaml
#NOTE: Wait for deploy #NOTE: Wait for deploy

8
tools/deployment/monitoring/openstack-exporter.sh
View File

@ -14,8 +14,9 @@
set -xe set -xe
#NOTE: Deploy command : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_OS_EXPORTER:="$(helm osh get-values-overrides -c prometheus-openstack-exporter ${FEATURES})"} : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_OS_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-openstack-exporter ${FEATURES})"}
tee /tmp/prometheus-openstack-exporter.yaml << EOF tee /tmp/prometheus-openstack-exporter.yaml << EOF
manifests: manifests:
@ -27,8 +28,9 @@ dependencies:
services: null services: null
EOF EOF
#NOTE: Deploy command
helm upgrade --install prometheus-openstack-exporter \ helm upgrade --install prometheus-openstack-exporter \
./prometheus-openstack-exporter \ ${OSH_INFRA_HELM_REPO}/prometheus-openstack-exporter \
--namespace=openstack \ --namespace=openstack \
--values=/tmp/prometheus-openstack-exporter.yaml \ --values=/tmp/prometheus-openstack-exporter.yaml \
${OSH_INFRA_EXTRA_HELM_ARGS_OS_EXPORTER} ${OSH_INFRA_EXTRA_HELM_ARGS_OS_EXPORTER}

8
tools/deployment/monitoring/process-exporter.sh
View File

@ -14,11 +14,13 @@
set -xe set -xe
#NOTE: Deploy command : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_PROCESS_EXPORTER:="$(helm osh get-values-overrides -c prometheus-process-exporter ${FEATURES})"} : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_PROCESS_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-process-exporter ${FEATURES})"}
#NOTE: Deploy command
helm upgrade --install prometheus-process-exporter \ helm upgrade --install prometheus-process-exporter \
./prometheus-process-exporter --namespace=kube-system \ ${OSH_INFRA_HELM_REPO}/prometheus-process-exporter --namespace=kube-system \
${OSH_INFRA_EXTRA_HELM_ARGS_PROCESS_EXPORTER} ${OSH_INFRA_EXTRA_HELM_ARGS_PROCESS_EXPORTER}
#NOTE: Wait for deploy #NOTE: Wait for deploy

6
tools/deployment/monitoring/prometheus.sh
View File

@ -14,11 +14,13 @@
set -xe set -xe
: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
FEATURE_GATES="alertmanager ceph elasticsearch kubernetes nodes openstack postgresql apparmor" FEATURE_GATES="alertmanager ceph elasticsearch kubernetes nodes openstack postgresql apparmor"
: ${OSH_INFRA_EXTRA_HELM_ARGS_PROMETHEUS:="$(helm osh get-values-overrides -c prometheus ${FEATURE_GATES} ${FEATURES})"} : ${OSH_INFRA_EXTRA_HELM_ARGS_PROMETHEUS:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus ${FEATURE_GATES} ${FEATURES})"}
#NOTE: Deploy command #NOTE: Deploy command
helm upgrade --install prometheus ./prometheus \ helm upgrade --install prometheus ${OSH_INFRA_HELM_REPO}/prometheus \
--namespace=osh-infra \ --namespace=osh-infra \
${OSH_INFRA_EXTRA_HELM_ARGS:=} \ ${OSH_INFRA_EXTRA_HELM_ARGS:=} \
${OSH_INFRA_EXTRA_HELM_ARGS_PROMETHEUS} ${OSH_INFRA_EXTRA_HELM_ARGS_PROMETHEUS}