Merge pull request #265 from solo-io/automation

[bot] Merge automation

gloo-gateway/1-17/enterprise-istio-ambient/default/README.md

@@ -925,6 +925,8 @@ global:
 EOF
 ```
 
+
+
 Run the following command to check that the Gloo Gateway pods are running:
 
 <!--bash

gloo-gateway/1-17/enterprise-istio-sidecar/default/README.md

@@ -875,6 +875,8 @@ global:
 EOF
 ```
 
+
+
 Run the following command to check that the Gloo Gateway pods are running:
 
 <!--bash

gloo-gateway/1-17/enterprise-multicluster-routing/default/README.md

@@ -197,6 +197,8 @@ settings:
 EOF
 ```
 
+
+
 Run the following command to check that the Gloo Gateway pods are running:
 
 <!--bash
@@ -1384,6 +1386,8 @@ settings:
 EOF
 ```
 
+
+
 Run the following command to check that the Gloo Gateway pods are running:
 
 <!--bash

gloo-gateway/1-17/enterprise/default/README.md

@@ -817,6 +817,8 @@ global:
 EOF
 ```
 
+
+
 Run the following command to check that the Gloo Gateway pods are running:
 
 <!--bash

gloo-gateway/1-17/gloo-edge/default/README.md

@@ -2699,6 +2699,8 @@ global:
 EOF
 ```
 
+
+
 Run the following command to check that the Gloo Gateway pods are running:
 
 <!--bash

gloo-gateway/1-17/gloo-mesh/default/README.md

@@ -3495,6 +3495,8 @@ global:
 EOF
 ```
 
+
+
 Run the following command to check that the Gloo Gateway pods are running:
 
 <!--bash

gloo-gateway/1-17/openshift/README.md

@@ -1021,6 +1021,8 @@ global:
   extensions:
     caching:
       enabled: true
+      deployment:
+        floatingUserId: true
   istioSDS:
     enabled: true
   istioIntegration:
@@ -1029,6 +1031,14 @@ global:
 EOF
 ```
 
+
+Let's completly disable Redis persistence to avoid providing more permissions on Openshift
+
+```bash
+kubectl --context $CLUSTER1 patch deployment redis -n gloo-system --type=json -p='[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value": "--save \"\""}]'
+```
+
+
 Run the following command to check that the Gloo Gateway pods are running:
 
 <!--bash

gloo-gateway/1-18/enterprise-istio-ambient/default/README.md

@@ -895,7 +895,7 @@ helm repo update
 helm upgrade -i -n gloo-system \
   gloo-gateway gloo-ee-test-helm/gloo-ee \
   --create-namespace \
-  --version 1.18.0-beta2-bmain-1203aed \
+  --version 1.18.0-beta2-bmain-bc445a4 \
   --kube-context $CLUSTER1 \
   --set-string license_key=$LICENSE_KEY \
   -f -<<EOF
@@ -945,6 +945,8 @@ global:
 EOF
 ```
 
+
+
 Run the following command to check that the Gloo Gateway pods are running:
 
 <!--bash
@@ -6680,6 +6682,7 @@ export API_KEY=<the value displayed in the UI>
 ```
 </details>
 
+
 <details>
   <summary>Using curl</summary>
 Create the user:
@@ -6932,6 +6935,7 @@ You should get the following response:
 ```
 </details>
 
+
 Try to access the API without authentication:
 
 ```shell
@@ -7104,7 +7108,7 @@ We can now configure the Gloo Gateway portal backend to use it:
 helm upgrade -i -n gloo-system \
   gloo-gateway gloo-ee-test-helm/gloo-ee \
   --create-namespace \
-  --version 1.18.0-beta2-bmain-1203aed \
+  --version 1.18.0-beta2-bmain-bc445a4 \
   --kube-context ${CLUSTER1} \
   --reuse-values \
   -f -<<EOF
@@ -7144,10 +7148,6 @@ spec:
 EOF
 ```
 
-<!--bash
-sleep 5
--->
-
 <details open>
   <summary>Using the portal frontend UI</summary>
 
@@ -7164,17 +7164,49 @@ export CLIENT_SECRET=<the value displayed in the UI>
 
 </details>
 
+
 <details>
   <summary>Using curl</summary>
 You can now get your oauth client id and secret:
 
 ```bash
+export USER1_COOKIE=$(node tests/keycloak-token.js "https://portal.example.com/v1/login" user1)
 read -r CLIENT_ID CLIENT_SECRET <<<$(curl -k -H "Cookie: ${USER1_COOKIE}" -X POST "https://portal.example.com/v1/apps/${APP_ID}/oauth-credentials" | jq -r '.idpClientId + " "+ .idpClientSecret')
 echo export CLIENT_ID=$CLIENT_ID
 echo export CLIENT_SECRET=$CLIENT_SECRET
 ```
+
+<!--bash
+if [ -n "$CLIENT_ID" ] && [ -n "$CLIENT_SECRET" ]; then
+    echo "Variables are already set"
+else
+    attempt=1
+    max_attempts=10
+
+    while [ $attempt -le $max_attempts ]; do
+        export USER1_COOKIE=$(node tests/keycloak-token.js "https://portal.example.com/v1/login" user1)
+        read -r CLIENT_ID CLIENT_SECRET <<<$(curl -k -H "Cookie: ${USER1_COOKIE}" -X POST "https://portal.example.com/v1/apps/${APP_ID}/oauth-credentials" | jq -r '.idpClientId + " "+ .idpClientSecret')
+
+        if [ -n "$CLIENT_ID" ] && [ -n "$CLIENT_SECRET" ]; then
+            echo "export CLIENT_ID=$CLIENT_ID"
+            echo "export CLIENT_SECRET=$CLIENT_SECRET"
+            break
+        fi
+
+        echo "Attempt $attempt of $max_attempts: Variables empty, retrying in 5 seconds..."
+        sleep 5
+        ((attempt++))
+    done
+
+    if [ $attempt -gt $max_attempts ]; then
+        echo "Failed to get non-empty variables after $max_attempts attempts"
+        exit 1
+    fi
+fi
+-->
 </details>
 
+
 Generate an access token using your client id and secret:
 
 ```bash

gloo-gateway/1-18/enterprise-istio-sidecar/default/README.md

@@ -840,7 +840,7 @@ helm repo update
 helm upgrade -i -n gloo-system \
   gloo-gateway gloo-ee-test-helm/gloo-ee \
   --create-namespace \
-  --version 1.18.0-beta2-bmain-1203aed \
+  --version 1.18.0-beta2-bmain-bc445a4 \
   --kube-context $CLUSTER1 \
   --set-string license_key=$LICENSE_KEY \
   -f -<<EOF
@@ -895,6 +895,8 @@ global:
 EOF
 ```
 
+
+
 Run the following command to check that the Gloo Gateway pods are running:
 
 <!--bash
@@ -6605,6 +6607,7 @@ export API_KEY=<the value displayed in the UI>
 ```
 </details>
 
+
 <details>
   <summary>Using curl</summary>
 Create the user:
@@ -6857,6 +6860,7 @@ You should get the following response:
 ```
 </details>
 
+
 Try to access the API without authentication:
 
 ```shell
@@ -7029,7 +7033,7 @@ We can now configure the Gloo Gateway portal backend to use it:
 helm upgrade -i -n gloo-system \
   gloo-gateway gloo-ee-test-helm/gloo-ee \
   --create-namespace \
-  --version 1.18.0-beta2-bmain-1203aed \
+  --version 1.18.0-beta2-bmain-bc445a4 \
   --kube-context ${CLUSTER1} \
   --reuse-values \
   -f -<<EOF
@@ -7069,10 +7073,6 @@ spec:
 EOF
 ```
 
-<!--bash
-sleep 5
--->
-
 <details open>
   <summary>Using the portal frontend UI</summary>
 
@@ -7089,17 +7089,49 @@ export CLIENT_SECRET=<the value displayed in the UI>
 
 </details>
 
+
 <details>
   <summary>Using curl</summary>
 You can now get your oauth client id and secret:
 
 ```bash
+export USER1_COOKIE=$(node tests/keycloak-token.js "https://portal.example.com/v1/login" user1)
 read -r CLIENT_ID CLIENT_SECRET <<<$(curl -k -H "Cookie: ${USER1_COOKIE}" -X POST "https://portal.example.com/v1/apps/${APP_ID}/oauth-credentials" | jq -r '.idpClientId + " "+ .idpClientSecret')
 echo export CLIENT_ID=$CLIENT_ID
 echo export CLIENT_SECRET=$CLIENT_SECRET
 ```
+
+<!--bash
+if [ -n "$CLIENT_ID" ] && [ -n "$CLIENT_SECRET" ]; then
+    echo "Variables are already set"
+else
+    attempt=1
+    max_attempts=10
+
+    while [ $attempt -le $max_attempts ]; do
+        export USER1_COOKIE=$(node tests/keycloak-token.js "https://portal.example.com/v1/login" user1)
+        read -r CLIENT_ID CLIENT_SECRET <<<$(curl -k -H "Cookie: ${USER1_COOKIE}" -X POST "https://portal.example.com/v1/apps/${APP_ID}/oauth-credentials" | jq -r '.idpClientId + " "+ .idpClientSecret')
+
+        if [ -n "$CLIENT_ID" ] && [ -n "$CLIENT_SECRET" ]; then
+            echo "export CLIENT_ID=$CLIENT_ID"
+            echo "export CLIENT_SECRET=$CLIENT_SECRET"
+            break
+        fi
+
+        echo "Attempt $attempt of $max_attempts: Variables empty, retrying in 5 seconds..."
+        sleep 5
+        ((attempt++))
+    done
+
+    if [ $attempt -gt $max_attempts ]; then
+        echo "Failed to get non-empty variables after $max_attempts attempts"
+        exit 1
+    fi
+fi
+-->
 </details>
 
+
 Generate an access token using your client id and secret:
 
 ```bash

gloo-gateway/1-18/enterprise-multicluster-routing/default/README.md

@@ -154,7 +154,7 @@ helm repo update
 helm upgrade -i -n gloo-system \
   gloo-gateway gloo-ee-test-helm/gloo-ee \
   --create-namespace \
-  --version 1.18.0-beta2-bmain-1203aed \
+  --version 1.18.0-beta2-bmain-bc445a4 \
   --kube-context $CLUSTER1 \
   --set-string license_key=$LICENSE_KEY \
   -f -<<EOF
@@ -197,6 +197,8 @@ settings:
 EOF
 ```
 
+
+
 Run the following command to check that the Gloo Gateway pods are running:
 
 <!--bash
@@ -1341,7 +1343,7 @@ helm repo update
 helm upgrade -i -n gloo-system \
   gloo-gateway gloo-ee-test-helm/gloo-ee \
   --create-namespace \
-  --version 1.18.0-beta2-bmain-1203aed \
+  --version 1.18.0-beta2-bmain-bc445a4 \
   --kube-context $CLUSTER2 \
   --set-string license_key=$LICENSE_KEY \
   -f -<<EOF
@@ -1384,6 +1386,8 @@ settings:
 EOF
 ```
 
+
+
 Run the following command to check that the Gloo Gateway pods are running:
 
 <!--bash