From 45bdbc945d6e1c929a858f11847647d3247b1e62 Mon Sep 17 00:00:00 2001 From: nshankar13 Date: Wed, 31 Mar 2021 18:12:53 -0400 Subject: [PATCH 1/2] Fix typos in manual demo Signed-off-by: nshankar13 --- docs/content/docs/install/manual_demo/_index.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/content/docs/install/manual_demo/_index.md b/docs/content/docs/install/manual_demo/_index.md index d9ceba9bf2..73bd618fad 100644 --- a/docs/content/docs/install/manual_demo/_index.md +++ b/docs/content/docs/install/manual_demo/_index.md @@ -112,7 +112,6 @@ In a browser, open up the following urls: - [http://localhost:8080](http://localhost:8080) - **bookbuyer** - [http://localhost:8083](http://localhost:8083) - **bookthief** - [http://localhost:8084](http://localhost:8084) - **bookstore** - - _Note: This page will not be available at this time in the demo. This will become available during the SMI Traffic Split configuration set up_ - [http://localhost:8082](http://localhost:8082) - **bookstore-v2** - _Note: This page will not be available at this time in the demo. This will become available during the SMI Traffic Split configuration set up_ @@ -211,7 +210,7 @@ kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/main/docs The counters should now be incrementing for the `bookbuyer`, and `bookstore` applications: - [http://localhost:8080](http://localhost:8080) - **bookbuyer** -- [http://localhost:8081](http://localhost:8084) - **bookstore** +- [http://localhost:8084](http://localhost:8084) - **bookstore** Note that the counter is _not_ incrementing for the `bookthief` application: @@ -362,7 +361,7 @@ Wait for the changes to propagate and observe the counters increment for `bookst browser windows: - [http://localhost:8082](http://localhost:8082) - **bookstore-v2** -- [http://localhost:8083](http://localhost:8083) - **bookstore** +- [http://localhost:8083](http://localhost:8084) - **bookstore** Now, all traffic directed to the `bookstore` service is flowing to `bookstore-v2`. From 55280d4230f6e57ee3fff7fc91b00f771457b962 Mon Sep 17 00:00:00 2001 From: Sneha Chhabria Date: Tue, 20 Apr 2021 14:07:49 -0700 Subject: [PATCH 2/2] chore(release): update chart and tags for v0.8.3 Signed-off-by: Sneha Chhabria --- charts/osm/Chart.yaml | 4 ++-- charts/osm/README.md | 2 +- charts/osm/values.yaml | 2 +- cmd/cli/install.go | 2 +- docs/example/manifests/apps/bookbuyer.yaml | 2 +- docs/example/manifests/apps/bookstore-v2.yaml | 2 +- docs/example/manifests/apps/bookstore.yaml | 2 +- docs/example/manifests/apps/bookthief.yaml | 2 +- docs/example/manifests/apps/bookwarehouse.yaml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/osm/Chart.yaml b/charts/osm/Chart.yaml index 9faef877d4..853c06d6b8 100644 --- a/charts/osm/Chart.yaml +++ b/charts/osm/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.8.3-rc.1 +version: 0.8.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: v0.8.3-rc.1 +appVersion: v0.8.3 diff --git a/charts/osm/README.md b/charts/osm/README.md index ad3b6791b3..1528003ddd 100644 --- a/charts/osm/README.md +++ b/charts/osm/README.md @@ -91,7 +91,7 @@ The following table lists the configurable parameters of the osm chart and their | OpenServiceMesh.grafana.port | int | `3000` | Grafana port | | OpenServiceMesh.image.pullPolicy | string | `"IfNotPresent"` | `osm-controller` pod PullPolicy | | OpenServiceMesh.image.registry | string | `"openservicemesh"` | `osm-controller` image registry | -| OpenServiceMesh.image.tag | string | `"v0.8.3-rc.1"` | `osm-controller` image tag | +| OpenServiceMesh.image.tag | string | `"v0.8.3"` | `osm-controller` image tag | | OpenServiceMesh.imagePullSecrets | list | `[]` | `osm-controller` image pull secret | | OpenServiceMesh.injector | object | `{"podLabels":{},"replicaCount":1,"resource":{"limits":{"cpu":"0.5","memory":"64M"},"requests":{"cpu":"0.3","memory":"64M"}}}` | Sidecar injector configuration | | OpenServiceMesh.meshName | string | `"osm"` | Name for the new control plane instance | diff --git a/charts/osm/values.yaml b/charts/osm/values.yaml index f486dbe257..f88f760a66 100644 --- a/charts/osm/values.yaml +++ b/charts/osm/values.yaml @@ -11,7 +11,7 @@ OpenServiceMesh: # -- `osm-controller` pod PullPolicy pullPolicy: IfNotPresent # -- `osm-controller` image tag - tag: v0.8.3-rc.1 + tag: v0.8.3 # -- `osm-controller` image pull secret imagePullSecrets: [] # -- Envoy sidecar image diff --git a/cmd/cli/install.go b/cmd/cli/install.go index 4f448d8d7b..c9fb865741 100644 --- a/cmd/cli/install.go +++ b/cmd/cli/install.go @@ -63,7 +63,7 @@ const ( defaultContainerRegistrySecret = "" defaultMeshName = "osm" defaultOsmImagePullPolicy = "IfNotPresent" - defaultOsmImageTag = "v0.8.3-rc.1" + defaultOsmImageTag = "v0.8.3" defaultPrometheusRetentionTime = constants.PrometheusDefaultRetentionTime defaultVaultHost = "" defaultVaultProtocol = "http" diff --git a/docs/example/manifests/apps/bookbuyer.yaml b/docs/example/manifests/apps/bookbuyer.yaml index ed3bca9961..0b636af002 100644 --- a/docs/example/manifests/apps/bookbuyer.yaml +++ b/docs/example/manifests/apps/bookbuyer.yaml @@ -36,7 +36,7 @@ spec: serviceAccountName: bookbuyer containers: - name: bookbuyer - image: openservicemesh/bookbuyer:v0.8.3-rc.1 + image: openservicemesh/bookbuyer:v0.8.3 imagePullPolicy: Always command: ["/bookbuyer"] env: diff --git a/docs/example/manifests/apps/bookstore-v2.yaml b/docs/example/manifests/apps/bookstore-v2.yaml index e25799ada5..2bfb6752e0 100644 --- a/docs/example/manifests/apps/bookstore-v2.yaml +++ b/docs/example/manifests/apps/bookstore-v2.yaml @@ -43,7 +43,7 @@ spec: serviceAccountName: bookstore-v2 containers: - name: bookstore - image: openservicemesh/bookstore:v0.8.3-rc.1 + image: openservicemesh/bookstore:v0.8.3 imagePullPolicy: Always ports: - containerPort: 14001 diff --git a/docs/example/manifests/apps/bookstore.yaml b/docs/example/manifests/apps/bookstore.yaml index e6f9861008..e4a0aebdb3 100644 --- a/docs/example/manifests/apps/bookstore.yaml +++ b/docs/example/manifests/apps/bookstore.yaml @@ -51,7 +51,7 @@ spec: serviceAccountName: bookstore containers: - name: bookstore - image: openservicemesh/bookstore:v0.8.3-rc.1 + image: openservicemesh/bookstore:v0.8.3 imagePullPolicy: Always ports: - containerPort: 14001 diff --git a/docs/example/manifests/apps/bookthief.yaml b/docs/example/manifests/apps/bookthief.yaml index 9b8885278f..1e60aeab08 100644 --- a/docs/example/manifests/apps/bookthief.yaml +++ b/docs/example/manifests/apps/bookthief.yaml @@ -35,7 +35,7 @@ spec: serviceAccountName: bookthief containers: - name: bookthief - image: openservicemesh/bookthief:v0.8.3-rc.1 + image: openservicemesh/bookthief:v0.8.3 imagePullPolicy: Always command: ["/bookthief"] env: diff --git a/docs/example/manifests/apps/bookwarehouse.yaml b/docs/example/manifests/apps/bookwarehouse.yaml index 7334be3ef0..74fa3e62a5 100644 --- a/docs/example/manifests/apps/bookwarehouse.yaml +++ b/docs/example/manifests/apps/bookwarehouse.yaml @@ -52,6 +52,6 @@ spec: serviceAccountName: bookwarehouse containers: - name: bookwarehouse - image: openservicemesh/bookwarehouse:v0.8.3-rc.1 + image: openservicemesh/bookwarehouse:v0.8.3 imagePullPolicy: Always command: ["/bookwarehouse"]