Skip to content

Commit

Permalink
[bot] Merge automation (#207)
Browse files Browse the repository at this point in the history 
* Update from solo-io/procgen@4d7bd1b
  • Loading branch information
@soloio-bot
soloio-bot authored Oct 25, 2023
1 parent b97e386 commit e3e9670
Show file tree
Hide file tree
Showing 74 changed files with 441 additions and 1,643 deletions.
45 changes: 19 additions & 26 deletions gloo-mesh-2-4/airgap/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,6 @@ export CLUSTER1=cluster1
export CLUSTER2=cluster2
```

> Note that in case you dont't have a Kubernetes cluster dedicated for the management plane, you would set the variables like that:
> ```
> export MGMT=cluster1
> export CLUSTER1=cluster1
> export CLUSTER2=cluster2
> ```
Run the following commands to deploy three Kubernetes clusters using [Kind](https://kind.sigs.k8s.io/):

```bash
Expand All @@ -109,8 +102,8 @@ Then run the following commands to wait for all the Pods to be ready:

```bash
./scripts/check.sh mgmt
./scripts/check.sh cluster1
./scripts/check.sh cluster2
./scripts/check.sh cluster1
./scripts/check.sh cluster2
```

**Note:** If you run the `check.sh` script immediately after the `deploy.sh` script, you may see a jsonpath error. If that happens, simply wait a few seconds and try again.
Expand Down Expand Up @@ -139,7 +132,7 @@ You can see that your currently connected to this cluster by executing the `kube
CURRENT NAME CLUSTER AUTHINFO NAMESPACE
cluster1 kind-cluster1 cluster1
* cluster2 kind-cluster2 cluster2
mgmt kind-mgmt kind-mgmt
mgmt kind-mgmt kind-mgmt
```

Run the following command to make `mgmt` the current cluster.
Expand All @@ -164,13 +157,13 @@ cat <<EOF > images.txt
docker.io/curlimages/curl
docker.io/kennethreitz/httpbin
docker.io/redis:7.0.11-alpine
gcr.io/gloo-mesh/ext-auth-service:0.48.0
gcr.io/gloo-mesh/gloo-mesh-agent:2.4.2
gcr.io/gloo-mesh/gloo-mesh-apiserver:2.4.2
gcr.io/gloo-mesh/gloo-mesh-envoy:2.4.2
gcr.io/gloo-mesh/gloo-mesh-mgmt-server:2.4.2
gcr.io/gloo-mesh/gloo-mesh-ui:2.4.2
gcr.io/gloo-mesh/gloo-otel-collector:2.4.2
gcr.io/gloo-mesh/ext-auth-service:0.51.0
gcr.io/gloo-mesh/gloo-mesh-agent:2.4.4
gcr.io/gloo-mesh/gloo-mesh-apiserver:2.4.4
gcr.io/gloo-mesh/gloo-mesh-envoy:2.4.4
gcr.io/gloo-mesh/gloo-mesh-mgmt-server:2.4.4
gcr.io/gloo-mesh/gloo-mesh-ui:2.4.4
gcr.io/gloo-mesh/gloo-otel-collector:2.4.4
gcr.io/gloo-mesh/rate-limiter:0.10.0
jimmidyson/configmap-reload:v0.5.0
quay.io/keycloak/keycloak:20.0.1
Expand Down Expand Up @@ -216,7 +209,7 @@ done
First of all, let's install the `meshctl` CLI:

```bash
export GLOO_MESH_VERSION=v2.4.2
export GLOO_MESH_VERSION=v2.4.4
curl -sL https://run.solo.io/meshctl/install | sh -
export PATH=$HOME/.gloo-mesh/bin:$PATH
```
Expand Down Expand Up @@ -262,11 +255,11 @@ kubectl --context ${MGMT} create ns gloo-mesh
helm upgrade --install gloo-platform-crds gloo-platform/gloo-platform-crds \
--namespace gloo-mesh \
--kube-context ${MGMT} \
--version=2.4.2
--version=2.4.4
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace gloo-mesh \
--kube-context ${MGMT} \
--version=2.4.2 \
--version=2.4.4 \
-f -<<EOF
licensing:
licenseKey: ${GLOO_MESH_LICENSE_KEY}
Expand Down Expand Up @@ -422,11 +415,11 @@ rm token
helm upgrade --install gloo-platform-crds gloo-platform/gloo-platform-crds \
--namespace=gloo-mesh \
--kube-context=${CLUSTER1} \
--version=2.4.2
--version=2.4.4
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace=gloo-mesh \
--kube-context=${CLUSTER1} \
--version=2.4.2 \
--version=2.4.4 \
-f -<<EOF
common:
cluster: cluster1
Expand Down Expand Up @@ -473,11 +466,11 @@ rm token
helm upgrade --install gloo-platform-crds gloo-platform/gloo-platform-crds \
--namespace=gloo-mesh \
--kube-context=${CLUSTER2} \
--version=2.4.2
--version=2.4.4
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace=gloo-mesh \
--kube-context=${CLUSTER2} \
--version=2.4.2 \
--version=2.4.4 \
-f -<<EOF
common:
cluster: cluster2
Expand Down Expand Up @@ -1368,7 +1361,7 @@ Then, you can deploy the addons on the cluster(s) using Helm:
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace gloo-mesh-addons \
--kube-context=${CLUSTER1} \
--version 2.4.2 \
--version 2.4.4 \
-f -<<EOF
common:
cluster: cluster1
Expand Down Expand Up @@ -1401,7 +1394,7 @@ EOF
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace gloo-mesh-addons \
--kube-context=${CLUSTER2} \
--version 2.4.2 \
--version 2.4.4 \
-f -<<EOF
common:
cluster: cluster2
Expand Down
59 changes: 26 additions & 33 deletions gloo-mesh-2-4/all-airgap/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,6 @@ export CLUSTER1=cluster1
export CLUSTER2=cluster2
```

> Note that in case you dont't have a Kubernetes cluster dedicated for the management plane, you would set the variables like that:
> ```
> export MGMT=cluster1
> export CLUSTER1=cluster1
> export CLUSTER2=cluster2
> ```
Run the following commands to deploy three Kubernetes clusters using [Kind](https://kind.sigs.k8s.io/):

```bash
Expand All @@ -120,8 +113,8 @@ Then run the following commands to wait for all the Pods to be ready:

```bash
./scripts/check.sh mgmt
./scripts/check.sh cluster1
./scripts/check.sh cluster2
./scripts/check.sh cluster1
./scripts/check.sh cluster2
```

**Note:** If you run the `check.sh` script immediately after the `deploy.sh` script, you may see a jsonpath error. If that happens, simply wait a few seconds and try again.
Expand Down Expand Up @@ -150,7 +143,7 @@ You can see that your currently connected to this cluster by executing the `kube
CURRENT NAME CLUSTER AUTHINFO NAMESPACE
cluster1 kind-cluster1 cluster1
* cluster2 kind-cluster2 cluster2
mgmt kind-mgmt kind-mgmt
mgmt kind-mgmt kind-mgmt
```

Run the following command to make `mgmt` the current cluster.
Expand All @@ -177,13 +170,13 @@ amazon/amazon-eks-pod-identity-webhook:v0.5.0
bats/bats:v1.4.1
docker.io/kennethreitz/httpbin
docker.io/redis:7.0.11-alpine
gcr.io/gloo-mesh/ext-auth-service:0.48.0
gcr.io/gloo-mesh/gloo-mesh-agent:2.4.2
gcr.io/gloo-mesh/gloo-mesh-apiserver:2.4.2
gcr.io/gloo-mesh/gloo-mesh-envoy:2.4.2
gcr.io/gloo-mesh/gloo-mesh-mgmt-server:2.4.2
gcr.io/gloo-mesh/gloo-mesh-ui:2.4.2
gcr.io/gloo-mesh/gloo-otel-collector:2.4.2
gcr.io/gloo-mesh/ext-auth-service:0.51.0
gcr.io/gloo-mesh/gloo-mesh-agent:2.4.4
gcr.io/gloo-mesh/gloo-mesh-apiserver:2.4.4
gcr.io/gloo-mesh/gloo-mesh-envoy:2.4.4
gcr.io/gloo-mesh/gloo-mesh-mgmt-server:2.4.4
gcr.io/gloo-mesh/gloo-mesh-ui:2.4.4
gcr.io/gloo-mesh/gloo-otel-collector:2.4.4
gcr.io/gloo-mesh/rate-limiter:0.10.0
gcr.io/solo-test-236622/mtls-test:0.0.6
grafana/grafana:9.3.1
Expand Down Expand Up @@ -247,7 +240,7 @@ done
First of all, let's install the `meshctl` CLI:

```bash
export GLOO_MESH_VERSION=v2.4.2
export GLOO_MESH_VERSION=v2.4.4
curl -sL https://run.solo.io/meshctl/install | sh -
export PATH=$HOME/.gloo-mesh/bin:$PATH
```
Expand Down Expand Up @@ -293,11 +286,11 @@ kubectl --context ${MGMT} create ns gloo-mesh
helm upgrade --install gloo-platform-crds gloo-platform/gloo-platform-crds \
--namespace gloo-mesh \
--kube-context ${MGMT} \
--version=2.4.2
--version=2.4.4
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace gloo-mesh \
--kube-context ${MGMT} \
--version=2.4.2 \
--version=2.4.4 \
-f -<<EOF
licensing:
licenseKey: ${GLOO_MESH_LICENSE_KEY}
Expand Down Expand Up @@ -453,11 +446,11 @@ rm token
helm upgrade --install gloo-platform-crds gloo-platform/gloo-platform-crds \
--namespace=gloo-mesh \
--kube-context=${CLUSTER1} \
--version=2.4.2
--version=2.4.4
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace=gloo-mesh \
--kube-context=${CLUSTER1} \
--version=2.4.2 \
--version=2.4.4 \
-f -<<EOF
common:
cluster: cluster1
Expand Down Expand Up @@ -504,11 +497,11 @@ rm token
helm upgrade --install gloo-platform-crds gloo-platform/gloo-platform-crds \
--namespace=gloo-mesh \
--kube-context=${CLUSTER2} \
--version=2.4.2
--version=2.4.4
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace=gloo-mesh \
--kube-context=${CLUSTER2} \
--version=2.4.2 \
--version=2.4.4 \
-f -<<EOF
common:
cluster: cluster2
Expand Down Expand Up @@ -1417,7 +1410,7 @@ Then, you can deploy the addons on the cluster(s) using Helm:
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace gloo-mesh-addons \
--kube-context=${CLUSTER1} \
--version 2.4.2 \
--version 2.4.4 \
-f -<<EOF
common:
cluster: cluster1
Expand Down Expand Up @@ -1450,7 +1443,7 @@ EOF
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace gloo-mesh-addons \
--kube-context=${CLUSTER2} \
--version 2.4.2 \
--version 2.4.4 \
-f -<<EOF
common:
cluster: cluster2
Expand Down Expand Up @@ -3529,7 +3522,7 @@ helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace gloo-mesh \
--kube-context=${CLUSTER1} \
--reuse-values \
--version 2.4.2 \
--version 2.4.4 \
--values - <<EOF
telemetryCollectorCustomization:
extraProcessors:
Expand Down Expand Up @@ -7565,11 +7558,11 @@ kubectl --context ${MGMT2} create ns gloo-mesh
helm upgrade --install gloo-platform-crds gloo-platform/gloo-platform-crds \
--namespace gloo-mesh \
--kube-context ${MGMT2} \
--version=2.4.2
--version=2.4.4
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace gloo-mesh \
--kube-context ${MGMT2} \
--version=2.4.2 \
--version=2.4.4 \
-f -<<EOF
licensing:
licenseKey: ${GLOO_MESH_LICENSE_KEY}
Expand Down Expand Up @@ -7776,11 +7769,11 @@ rm token
helm upgrade --install gloo-platform-crds gloo-platform/gloo-platform-crds \
--namespace=gloo-mesh \
--kube-context=${CLUSTER1} \
--version=2.4.2
--version=2.4.4
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace=gloo-mesh \
--kube-context=${CLUSTER1} \
--version=2.4.2 \
--version=2.4.4 \
-f -<<EOF
common:
cluster: cluster1
Expand Down Expand Up @@ -7821,11 +7814,11 @@ rm token
helm upgrade --install gloo-platform-crds gloo-platform/gloo-platform-crds \
--namespace=gloo-mesh \
--kube-context=${CLUSTER2} \
--version=2.4.2
--version=2.4.4
helm upgrade --install gloo-platform gloo-platform/gloo-platform \
--namespace=gloo-mesh \
--kube-context=${CLUSTER2} \
--version=2.4.2 \
--version=2.4.4 \
-f -<<EOF
common:
cluster: cluster2
Expand Down
Loading

0 comments on commit e3e9670

Please sign in to comment.