diff --git a/tools/deployment/common/010-deploy-docker-registry.sh b/tools/deployment/common/010-deploy-docker-registry.sh index 1302c8419..6073c5a67 100755 --- a/tools/deployment/common/010-deploy-docker-registry.sh +++ b/tools/deployment/common/010-deploy-docker-registry.sh @@ -52,11 +52,6 @@ helm upgrade --install docker-registry ./registry \ #NOTE: Wait for deployments ./tools/deployment/common/wait-for-pods.sh docker-registry -#NOTE: Validate Deployment info -helm status docker-registry-nfs-provisioner -helm status docker-registry-redis -helm status docker-registry - # Delete the test pod if it still exists kubectl delete pods -l application=redis,release_group=docker-registry-redis,component=test --namespace=docker-registry --ignore-not-found #NOTE: Run helm tests diff --git a/tools/deployment/common/020-ingress.sh b/tools/deployment/common/020-ingress.sh index 3f54b9c08..29874eb45 100755 --- a/tools/deployment/common/020-ingress.sh +++ b/tools/deployment/common/020-ingress.sh @@ -32,9 +32,6 @@ helm upgrade --install ingress-kube-system ./ingress \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system -#NOTE: Display info -helm status ingress-kube-system - #NOTE: Deploy namespace ingress helm upgrade --install ingress-osh-infra ./ingress \ --namespace=osh-infra \ @@ -43,6 +40,3 @@ helm upgrade --install ingress-osh-infra ./ingress \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Display info -helm status ingress-osh-infra diff --git a/tools/deployment/common/030-nfs-provisioner.sh b/tools/deployment/common/030-nfs-provisioner.sh index 669e5e251..4ca67dd9f 100755 --- a/tools/deployment/common/030-nfs-provisioner.sh +++ b/tools/deployment/common/030-nfs-provisioner.sh @@ -30,6 +30,3 @@ helm upgrade --install nfs-provisioner \ #NOTE: Wait for deployment ./tools/deployment/common/wait-for-pods.sh nfs - -#NOTE: Validate Deployment info -helm status nfs-provisioner diff --git a/tools/deployment/common/040-ldap.sh b/tools/deployment/common/040-ldap.sh index 4befaf565..4ed952a28 100755 --- a/tools/deployment/common/040-ldap.sh +++ b/tools/deployment/common/040-ldap.sh @@ -27,6 +27,3 @@ helm upgrade --install ldap ./ldap \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status ldap diff --git a/tools/deployment/common/070-kube-state-metrics.sh b/tools/deployment/common/070-kube-state-metrics.sh index fda13918e..35c8e2645 100755 --- a/tools/deployment/common/070-kube-state-metrics.sh +++ b/tools/deployment/common/070-kube-state-metrics.sh @@ -26,6 +26,3 @@ helm upgrade --install prometheus-kube-state-metrics \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Validate Deployment info -helm status prometheus-kube-state-metrics diff --git a/tools/deployment/common/080-node-exporter.sh b/tools/deployment/common/080-node-exporter.sh index 4626ce6a2..5527a9db8 100755 --- a/tools/deployment/common/080-node-exporter.sh +++ b/tools/deployment/common/080-node-exporter.sh @@ -26,6 +26,3 @@ helm upgrade --install prometheus-node-exporter \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Validate Deployment info -helm status prometheus-node-exporter diff --git a/tools/deployment/common/090-process-exporter.sh b/tools/deployment/common/090-process-exporter.sh index 97cddfd95..167930de5 100755 --- a/tools/deployment/common/090-process-exporter.sh +++ b/tools/deployment/common/090-process-exporter.sh @@ -26,6 +26,3 @@ helm upgrade --install prometheus-process-exporter \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Validate Deployment info -helm status prometheus-process-exporter diff --git a/tools/deployment/common/150-falco.sh b/tools/deployment/common/150-falco.sh index 1b653f2d6..c46ace69c 100755 --- a/tools/deployment/common/150-falco.sh +++ b/tools/deployment/common/150-falco.sh @@ -23,6 +23,3 @@ helm upgrade --install falco ./falco \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Validate Deployment info -helm status falco diff --git a/tools/deployment/common/blackbox-exporter.sh b/tools/deployment/common/blackbox-exporter.sh index 816d25044..4ed1b44d9 100755 --- a/tools/deployment/common/blackbox-exporter.sh +++ b/tools/deployment/common/blackbox-exporter.sh @@ -23,6 +23,3 @@ helm upgrade --install prometheus-blackbox-exporter \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status prometheus-blackbox-exporter diff --git a/tools/deployment/common/daemonjob-controller.sh b/tools/deployment/common/daemonjob-controller.sh index 0fbbd013b..531b01827 100755 --- a/tools/deployment/common/daemonjob-controller.sh +++ b/tools/deployment/common/daemonjob-controller.sh @@ -48,9 +48,6 @@ until [[ $daemonjob_controller_status == 'Running' ]] || [ $NEXT_WAIT_TIME -eq 5 NEXT_WAIT_TIME=$((NEXT_WAIT_TIME+1)) done -#NOTE: Validate DaemonjobController Deployment info -helm status daemonjob-controller - #NOTE: Create sample-daemonjob.yaml tee /tmp/sample-daemonjob.yaml << EOF apiVersion: ctl.example.com/v1 diff --git a/tools/deployment/common/fluentbit.sh b/tools/deployment/common/fluentbit.sh index ad63bc100..2a15ba0e6 100755 --- a/tools/deployment/common/fluentbit.sh +++ b/tools/deployment/common/fluentbit.sh @@ -27,6 +27,3 @@ helm upgrade --install fluentbit ./fluentbit \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status fluentbit diff --git a/tools/deployment/common/fluentd.sh b/tools/deployment/common/fluentd.sh index c7c22b83e..7bf34b75d 100755 --- a/tools/deployment/common/fluentd.sh +++ b/tools/deployment/common/fluentd.sh @@ -186,6 +186,3 @@ helm upgrade --install fluentd ./fluentd \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status fluentd diff --git a/tools/deployment/common/metacontroller.sh b/tools/deployment/common/metacontroller.sh index c0ad04491..81e84d351 100755 --- a/tools/deployment/common/metacontroller.sh +++ b/tools/deployment/common/metacontroller.sh @@ -52,5 +52,3 @@ done if test $COUNTER -eq 3; then echo "crds created succesfully" fi - -helm status metacontroller diff --git a/tools/deployment/common/nagios.sh b/tools/deployment/common/nagios.sh index 43b9118fa..ab4506f28 100755 --- a/tools/deployment/common/nagios.sh +++ b/tools/deployment/common/nagios.sh @@ -35,9 +35,6 @@ helm upgrade --install nagios ./nagios \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -#NOTE: Validate Deployment info -helm status nagios - #NOTE: Verify elasticsearch query clauses are functional by execing into pod NAGIOS_POD=$(kubectl -n osh-infra get pods -l='application=nagios,component=monitoring' --output=jsonpath='{.items[0].metadata.name}') kubectl exec $NAGIOS_POD -n osh-infra -c nagios -- cat /opt/nagios/etc/objects/query_es_clauses.json | python -m json.tool diff --git a/tools/deployment/common/node-problem-detector.sh b/tools/deployment/common/node-problem-detector.sh index 031310aaf..7bbd114e4 100755 --- a/tools/deployment/common/node-problem-detector.sh +++ b/tools/deployment/common/node-problem-detector.sh @@ -33,6 +33,3 @@ helm upgrade --install kubernetes-node-problem-detector \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Validate Deployment info -helm status kubernetes-node-problem-detector diff --git a/tools/deployment/common/openstack-exporter.sh b/tools/deployment/common/openstack-exporter.sh index ad3c7369a..b55ab1c39 100755 --- a/tools/deployment/common/openstack-exporter.sh +++ b/tools/deployment/common/openstack-exporter.sh @@ -38,6 +38,3 @@ helm upgrade --install prometheus-openstack-exporter \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status prometheus-openstack-exporter diff --git a/tools/deployment/common/postgresql.sh b/tools/deployment/common/postgresql.sh index 3fa1c2519..ffb685f78 100755 --- a/tools/deployment/common/postgresql.sh +++ b/tools/deployment/common/postgresql.sh @@ -32,6 +32,3 @@ helm upgrade --install postgresql ./postgresql \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status postgresql