diff --git a/.github/workflows/pss_test.yaml b/.github/workflows/pss_test.yaml index 17f5de9e06..55c569e5b0 100644 --- a/.github/workflows/pss_test.yaml +++ b/.github/workflows/pss_test.yaml @@ -58,22 +58,22 @@ jobs: kubectl get "$KIND" "$NAME" -n "$NAMESPACE" &> /dev/null if [ $? -eq 0 ]; then kubectl patch "$KIND" "$NAME" -n "$NAMESPACE" --patch-file "$file" - # if [ "$NAME" = "oauth2-proxy" ]; then - # kubectl wait -n oauth2-proxy --for=condition=ready pod -l 'app.kubernetes.io/name=oauth2-proxy' --timeout=180s - # elif [ "$NAME" = "metadata-envoy-deployment" ]; then - # kubectl wait -n kubeflow --for=condition=ready pod -l 'component=metadata-envoy' --timeout=180s - # elif [ "$NAME" = "metadata-grpc-deployment" ]; then - # kubectl wait -n kubeflow --for=condition=ready pod -l 'component=metadata-grpc-server' --timeout=180s - # elif [ "$NAME" = "profiles-deployment" -o "$NAME" = "ml-pipeline" ]; then - # echo "skipping this patch" - # # kubectl describe pod -l 'kustomize.component=profiles' -n kubeflow - # # kubectl wait -n kubeflow --for=condition=ready pod -l 'kustomize.component=profiles' --timeout=300s - # else - # echo "Fetching logs for pod: $NAME" - # # kubectl describe pod -l app="$NAME" -n "$NAMESPACE" - # # kubectl delete pod -l app="$NAME" -n "$NAMESPACE" - # kubectl wait -n "$NAMESPACE" --for=condition=ready pod -l app="$NAME" --timeout=600s - # fi + if [ "$NAME" = "oauth2-proxy" ]; then + kubectl wait -n oauth2-proxy --for=condition=ready pod -l 'app.kubernetes.io/name=oauth2-proxy' --timeout=180s + elif [ "$NAME" = "metadata-envoy-deployment" ]; then + kubectl wait -n kubeflow --for=condition=ready pod -l 'component=metadata-envoy' --timeout=180s + elif [ "$NAME" = "metadata-grpc-deployment" ]; then + kubectl wait -n kubeflow --for=condition=ready pod -l 'component=metadata-grpc-server' --timeout=180s + elif [ "$NAME" = "profiles-deployment" -o "$NAME" = "ml-pipeline" ]; then + echo "skipping this patch" + # kubectl describe pod -l 'kustomize.component=profiles' -n kubeflow + # kubectl wait -n kubeflow --for=condition=ready pod -l 'kustomize.component=profiles' --timeout=300s + else + echo "Fetching logs for pod: $NAME" + # kubectl describe pod -l app="$NAME" -n "$NAMESPACE" + # kubectl delete pod -l app="$NAME" -n "$NAMESPACE" + kubectl wait -n "$NAMESPACE" --for=condition=ready pod -l app="$NAME" --timeout=600s + fi fi done sleep 60 @@ -104,11 +104,6 @@ jobs: # sleep 60 # kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout=600s --field-selector=status.phase!=Succeeded - - name: Reapplying kubeflow resources - run: | - ./tests/gh-actions/install_multi_tenancy.sh - ./tests/gh-actions/install_pipelines.sh - - name: Apply Pod Security Standards baseline levels for static namespaces run: ./tests/gh-actions/enable_baseline_PSS.sh