Skip to content

Commit 4af65b7

Browse files
djannotdjannot
authored
Merge pull request #265 from solo-io/automation
[bot] Merge automation
2 parents 2e9fdbb + d449d1f commit 4af65b7

File tree

35 files changed

+3621
-155
lines changed

35 files changed

+3621
-155
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -925,6 +925,8 @@ global:
925925
EOF
926926
```
927927

928+
929+
928930
Run the following command to check that the Gloo Gateway pods are running:
929931

930932
<!--bash

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -875,6 +875,8 @@ global:
875875
EOF
876876
```
877877

878+
879+
878880
Run the following command to check that the Gloo Gateway pods are running:
879881

880882
<!--bash

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ settings:
197197
EOF
198198
```
199199

200+
201+
200202
Run the following command to check that the Gloo Gateway pods are running:
201203

202204
<!--bash
@@ -1384,6 +1386,8 @@ settings:
13841386
EOF
13851387
```
13861388

1389+
1390+
13871391
Run the following command to check that the Gloo Gateway pods are running:
13881392

13891393
<!--bash

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -817,6 +817,8 @@ global:
817817
EOF
818818
```
819819

820+
821+
820822
Run the following command to check that the Gloo Gateway pods are running:
821823

822824
<!--bash

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2699,6 +2699,8 @@ global:
26992699
EOF
27002700
```
27012701

2702+
2703+
27022704
Run the following command to check that the Gloo Gateway pods are running:
27032705

27042706
<!--bash

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3495,6 +3495,8 @@ global:
34953495
EOF
34963496
```
34973497

3498+
3499+
34983500
Run the following command to check that the Gloo Gateway pods are running:
34993501

35003502
<!--bash

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,6 +1021,8 @@ global:
10211021
extensions:
10221022
caching:
10231023
enabled: true
1024+
deployment:
1025+
floatingUserId: true
10241026
istioSDS:
10251027
enabled: true
10261028
istioIntegration:
@@ -1029,6 +1031,14 @@ global:
10291031
EOF
10301032
```
10311033

1034+
1035+
Let's completly disable Redis persistence to avoid providing more permissions on Openshift
1036+
1037+
```bash
1038+
kubectl --context $CLUSTER1 patch deployment redis -n gloo-system --type=json -p='[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value": "--save \"\""}]'
1039+
```
1040+
1041+
10321042
Run the following command to check that the Gloo Gateway pods are running:
10331043

10341044
<!--bash

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

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ helm repo update
895895
helm upgrade -i -n gloo-system \
896896
gloo-gateway gloo-ee-test-helm/gloo-ee \
897897
--create-namespace \
898-
--version 1.18.0-beta2-bmain-1203aed \
898+
--version 1.18.0-beta2-bmain-bc445a4 \
899899
--kube-context $CLUSTER1 \
900900
--set-string license_key=$LICENSE_KEY \
901901
-f -<<EOF
@@ -945,6 +945,8 @@ global:
945945
EOF
946946
```
947947

948+
949+
948950
Run the following command to check that the Gloo Gateway pods are running:
949951

950952
<!--bash
@@ -6680,6 +6682,7 @@ export API_KEY=<the value displayed in the UI>
66806682
```
66816683
</details>
66826684

6685+
66836686
<details>
66846687
<summary>Using curl</summary>
66856688
Create the user:
@@ -6932,6 +6935,7 @@ You should get the following response:
69326935
```
69336936
</details>
69346937

6938+
69356939
Try to access the API without authentication:
69366940

69376941
```shell
@@ -7104,7 +7108,7 @@ We can now configure the Gloo Gateway portal backend to use it:
71047108
helm upgrade -i -n gloo-system \
71057109
gloo-gateway gloo-ee-test-helm/gloo-ee \
71067110
--create-namespace \
7107-
--version 1.18.0-beta2-bmain-1203aed \
7111+
--version 1.18.0-beta2-bmain-bc445a4 \
71087112
--kube-context ${CLUSTER1} \
71097113
--reuse-values \
71107114
-f -<<EOF
@@ -7144,10 +7148,6 @@ spec:
71447148
EOF
71457149
```
71467150

7147-
<!--bash
7148-
sleep 5
7149-
-->
7150-
71517151
<details open>
71527152
<summary>Using the portal frontend UI</summary>
71537153

@@ -7164,17 +7164,49 @@ export CLIENT_SECRET=<the value displayed in the UI>
71647164

71657165
</details>
71667166

7167+
71677168
<details>
71687169
<summary>Using curl</summary>
71697170
You can now get your oauth client id and secret:
71707171

71717172
```bash
7173+
export USER1_COOKIE=$(node tests/keycloak-token.js "https://portal.example.com/v1/login" user1)
71727174
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')
71737175
echo export CLIENT_ID=$CLIENT_ID
71747176
echo export CLIENT_SECRET=$CLIENT_SECRET
71757177
```
7178+
7179+
<!--bash
7180+
if [ -n "$CLIENT_ID" ] && [ -n "$CLIENT_SECRET" ]; then
7181+
echo "Variables are already set"
7182+
else
7183+
attempt=1
7184+
max_attempts=10
7185+
7186+
while [ $attempt -le $max_attempts ]; do
7187+
export USER1_COOKIE=$(node tests/keycloak-token.js "https://portal.example.com/v1/login" user1)
7188+
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')
7189+
7190+
if [ -n "$CLIENT_ID" ] && [ -n "$CLIENT_SECRET" ]; then
7191+
echo "export CLIENT_ID=$CLIENT_ID"
7192+
echo "export CLIENT_SECRET=$CLIENT_SECRET"
7193+
break
7194+
fi
7195+
7196+
echo "Attempt $attempt of $max_attempts: Variables empty, retrying in 5 seconds..."
7197+
sleep 5
7198+
((attempt++))
7199+
done
7200+
7201+
if [ $attempt -gt $max_attempts ]; then
7202+
echo "Failed to get non-empty variables after $max_attempts attempts"
7203+
exit 1
7204+
fi
7205+
fi
7206+
-->
71767207
</details>
71777208

7209+
71787210
Generate an access token using your client id and secret:
71797211

71807212
```bash

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

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ helm repo update
840840
helm upgrade -i -n gloo-system \
841841
gloo-gateway gloo-ee-test-helm/gloo-ee \
842842
--create-namespace \
843-
--version 1.18.0-beta2-bmain-1203aed \
843+
--version 1.18.0-beta2-bmain-bc445a4 \
844844
--kube-context $CLUSTER1 \
845845
--set-string license_key=$LICENSE_KEY \
846846
-f -<<EOF
@@ -895,6 +895,8 @@ global:
895895
EOF
896896
```
897897

898+
899+
898900
Run the following command to check that the Gloo Gateway pods are running:
899901

900902
<!--bash
@@ -6605,6 +6607,7 @@ export API_KEY=<the value displayed in the UI>
66056607
```
66066608
</details>
66076609

6610+
66086611
<details>
66096612
<summary>Using curl</summary>
66106613
Create the user:
@@ -6857,6 +6860,7 @@ You should get the following response:
68576860
```
68586861
</details>
68596862

6863+
68606864
Try to access the API without authentication:
68616865

68626866
```shell
@@ -7029,7 +7033,7 @@ We can now configure the Gloo Gateway portal backend to use it:
70297033
helm upgrade -i -n gloo-system \
70307034
gloo-gateway gloo-ee-test-helm/gloo-ee \
70317035
--create-namespace \
7032-
--version 1.18.0-beta2-bmain-1203aed \
7036+
--version 1.18.0-beta2-bmain-bc445a4 \
70337037
--kube-context ${CLUSTER1} \
70347038
--reuse-values \
70357039
-f -<<EOF
@@ -7069,10 +7073,6 @@ spec:
70697073
EOF
70707074
```
70717075

7072-
<!--bash
7073-
sleep 5
7074-
-->
7075-
70767076
<details open>
70777077
<summary>Using the portal frontend UI</summary>
70787078

@@ -7089,17 +7089,49 @@ export CLIENT_SECRET=<the value displayed in the UI>
70897089

70907090
</details>
70917091

7092+
70927093
<details>
70937094
<summary>Using curl</summary>
70947095
You can now get your oauth client id and secret:
70957096

70967097
```bash
7098+
export USER1_COOKIE=$(node tests/keycloak-token.js "https://portal.example.com/v1/login" user1)
70977099
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')
70987100
echo export CLIENT_ID=$CLIENT_ID
70997101
echo export CLIENT_SECRET=$CLIENT_SECRET
71007102
```
7103+
7104+
<!--bash
7105+
if [ -n "$CLIENT_ID" ] && [ -n "$CLIENT_SECRET" ]; then
7106+
echo "Variables are already set"
7107+
else
7108+
attempt=1
7109+
max_attempts=10
7110+
7111+
while [ $attempt -le $max_attempts ]; do
7112+
export USER1_COOKIE=$(node tests/keycloak-token.js "https://portal.example.com/v1/login" user1)
7113+
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')
7114+
7115+
if [ -n "$CLIENT_ID" ] && [ -n "$CLIENT_SECRET" ]; then
7116+
echo "export CLIENT_ID=$CLIENT_ID"
7117+
echo "export CLIENT_SECRET=$CLIENT_SECRET"
7118+
break
7119+
fi
7120+
7121+
echo "Attempt $attempt of $max_attempts: Variables empty, retrying in 5 seconds..."
7122+
sleep 5
7123+
((attempt++))
7124+
done
7125+
7126+
if [ $attempt -gt $max_attempts ]; then
7127+
echo "Failed to get non-empty variables after $max_attempts attempts"
7128+
exit 1
7129+
fi
7130+
fi
7131+
-->
71017132
</details>
71027133

7134+
71037135
Generate an access token using your client id and secret:
71047136

71057137
```bash

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ helm repo update
154154
helm upgrade -i -n gloo-system \
155155
gloo-gateway gloo-ee-test-helm/gloo-ee \
156156
--create-namespace \
157-
--version 1.18.0-beta2-bmain-1203aed \
157+
--version 1.18.0-beta2-bmain-bc445a4 \
158158
--kube-context $CLUSTER1 \
159159
--set-string license_key=$LICENSE_KEY \
160160
-f -<<EOF
@@ -197,6 +197,8 @@ settings:
197197
EOF
198198
```
199199

200+
201+
200202
Run the following command to check that the Gloo Gateway pods are running:
201203

202204
<!--bash
@@ -1341,7 +1343,7 @@ helm repo update
13411343
helm upgrade -i -n gloo-system \
13421344
gloo-gateway gloo-ee-test-helm/gloo-ee \
13431345
--create-namespace \
1344-
--version 1.18.0-beta2-bmain-1203aed \
1346+
--version 1.18.0-beta2-bmain-bc445a4 \
13451347
--kube-context $CLUSTER2 \
13461348
--set-string license_key=$LICENSE_KEY \
13471349
-f -<<EOF
@@ -1384,6 +1386,8 @@ settings:
13841386
EOF
13851387
```
13861388

1389+
1390+
13871391
Run the following command to check that the Gloo Gateway pods are running:
13881392

13891393
<!--bash

0 commit comments

Comments
 (0)