Adjust to use expected CI namespace

rancher · Oct 7, 2024 · e4ee0fc · e4ee0fc
1 parent 6d32c17
commit e4ee0fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/e2e/scripts/generate-artifacts.sh b/.github/workflows/e2e/scripts/generate-artifacts.sh
@@ -61,6 +61,7 @@ kubectl get statefulset -n cattle-monitoring-system -o yaml > ${MANIFEST_DIRECTO
 kubectl get pods -n cattle-monitoring-system -o yaml > ${MANIFEST_DIRECTORY}/pods/cattle-monitoring-system.yaml || true
 
 ## cattle-project-p-example ns manifests
+kubectl get deployment -n cattle-project-p-example -o yaml > ${MANIFEST_DIRECTORY}/deployments/cattle-project-p-example.yaml || true
 kubectl get projecthelmchart -n cattle-project-p-example -o yaml > ${MANIFEST_DIRECTORY}/projecthelmcharts/cattle-project-p-example.yaml || true
 kubectl get statefulset -n cattle-project-p-example -o yaml > ${MANIFEST_DIRECTORY}/statefulsets/cattle-project-p-example.yaml || true
 kubectl get pods -n cattle-project-p-example -o yaml > ${MANIFEST_DIRECTORY}/pods/cattle-project-p-example.yaml || true

diff --git a/.github/workflows/e2e/scripts/validate-project-monitoring.sh b/.github/workflows/e2e/scripts/validate-project-monitoring.sh
@@ -6,17 +6,17 @@ source $(dirname $0)/entry
 
 cd $(dirname $0)/../../../..
 
-if ! kubectl -n cattle-project-p-example-monitoring rollout status statefulset alertmanager-cattle-project-p-example-m-alertmanager --timeout="${KUBECTL_WAIT_TIMEOUT}"; then
+if ! kubectl -n cattle-project-p-example rollout status statefulset alertmanager-cattle-project-p-example-m-alertmanager --timeout="${KUBECTL_WAIT_TIMEOUT}"; then
     echo "ERROR: Project Alertmanager did not roll out"
     exit 1;
 fi
 
-if ! kubectl -n cattle-project-p-example-monitoring rollout status statefulset prometheus-cattle-project-p-example-m-prometheus --timeout="${KUBECTL_WAIT_TIMEOUT}"; then
+if ! kubectl -n cattle-project-p-example rollout status statefulset prometheus-cattle-project-p-example-m-prometheus --timeout="${KUBECTL_WAIT_TIMEOUT}"; then
     echo "ERROR: Project Prometheus did not roll out"
     exit 1;
 fi
 
-if ! kubectl -n cattle-project-p-example-monitoring rollout status deployment cattle-project-p-example-monitoring-grafana --timeout="${KUBECTL_WAIT_TIMEOUT}"; then
+if ! kubectl -n cattle-project-p-example rollout status deployment cattle-project-p-example-monitoring-grafana --timeout="${KUBECTL_WAIT_TIMEOUT}"; then
     echo "ERROR: Project Grafana did not roll out"
     exit 1
 fi