Skip to content
This repository has been archived by the owner on Jul 11, 2023. It is now read-only.

chore(release): cut v1.1.0-rc.1 #4630

Merged
merged 7 commits into from
Apr 4, 2022
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/osm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ 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: 1.0.0
version: 1.1.0-rc.1

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version field should also be updated

# 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: latest-main
appVersion: v1.1.0-rc.1

# This specifies the minimum Kubernetes version OSM is compatible with.
kubeVersion: ">= 1.20.0-0"
Expand Down
20 changes: 10 additions & 10 deletions charts/osm/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Open Service Mesh Helm Chart

![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest-main](https://img.shields.io/badge/AppVersion-latest--main-informational?style=flat-square)
![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.1.0](https://img.shields.io/badge/AppVersion-v1.1.0-informational?style=flat-square)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.1.0](https://img.shields.io/badge/AppVersion-v1.1.0-informational?style=flat-square)
![Version: 1.1.0-rc.1](https://img.shields.io/badge/Version-1.1.0--rc.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.1.0-rc.1](https://img.shields.io/badge/AppVersion-v1.1.0--rc.1-informational?style=flat-square)


A Helm chart to install the [OSM](https://github.com/openservicemesh/osm) control plane on Kubernetes.

Expand Down Expand Up @@ -106,14 +106,14 @@ The following table lists the configurable parameters of the osm chart and their
| osm.grafana.image | string | `"grafana/grafana:8.2.2"` | Image used for Grafana |
| osm.grafana.port | int | `3000` | Grafana service's port |
| osm.grafana.rendererImage | string | `"grafana/grafana-image-renderer:3.2.1"` | Image used for Grafana Renderer |
| osm.image.digest | object | `{"osmBootstrap":"","osmCRDs":"","osmController":"","osmHealthcheck":"","osmInjector":"","osmPreinstall":"","osmSidecarInit":""}` | Image digest (defaults to latest compatible tag) |
| osm.image.digest.osmBootstrap | string | `""` | osm-boostrap's image digest |
| osm.image.digest.osmCRDs | string | `""` | osm-crds' image digest |
| osm.image.digest.osmController | string | `""` | osm-controller's image digest |
| osm.image.digest.osmHealthcheck | string | `""` | osm-healthcheck's image digest |
| osm.image.digest.osmInjector | string | `""` | osm-injector's image digest |
| osm.image.digest.osmPreinstall | string | `""` | osm-preinstall's image digest |
| osm.image.digest.osmSidecarInit | string | `""` | Sidecar init container's image digest |
| osm.image.digest | object | `{"osmBootstrap":"sha256:6b1cbe1ba00c5d3c1ae0b2355b48e8efbcc44ce0a9c79324c36f3b1e43a54d61","osmCRDs":"sha256:f5963ed9c41ad88f6be14d236d9aae5ec3f333a388ad4a992ff0afc9f374951d","osmController":"sha256:afe9bac0cd67018cff956c4fa1bd1fd8792ffa7938e978a16f772f9fdb4f94f5","osmHealthcheck":"sha256:b9caaa6926a8d7e6ca6f5551808d1c572ddcb7dc596fb039bdb326ade4539496","osmInjector":"sha256:a6d688b3b2777a10b702b947528cb19e5a61ebca675b51d19457a96fd105d640","osmPreinstall":"sha256:704b1c8af9918b61585b3d7157acee28ff4dc1ecfd3d1b210b80cb688986f177","osmSidecarInit":"sha256:f87c4cf91b8ff6721133dce7ae889504b1061935a4d7b010f818b62b39268817"}` | Image digest (defaults to latest compatible tag) |
| osm.image.digest.osmBootstrap | string | `"sha256:6b1cbe1ba00c5d3c1ae0b2355b48e8efbcc44ce0a9c79324c36f3b1e43a54d61"` | osm-boostrap's image digest |
| osm.image.digest.osmCRDs | string | `"sha256:f5963ed9c41ad88f6be14d236d9aae5ec3f333a388ad4a992ff0afc9f374951d"` | osm-crds' image digest |
| osm.image.digest.osmController | string | `"sha256:afe9bac0cd67018cff956c4fa1bd1fd8792ffa7938e978a16f772f9fdb4f94f5"` | osm-controller's image digest |
| osm.image.digest.osmHealthcheck | string | `"sha256:b9caaa6926a8d7e6ca6f5551808d1c572ddcb7dc596fb039bdb326ade4539496"` | osm-healthcheck's image digest |
| osm.image.digest.osmInjector | string | `"sha256:a6d688b3b2777a10b702b947528cb19e5a61ebca675b51d19457a96fd105d640"` | osm-injector's image digest |
| osm.image.digest.osmPreinstall | string | `"sha256:704b1c8af9918b61585b3d7157acee28ff4dc1ecfd3d1b210b80cb688986f177"` | osm-preinstall's image digest |
| osm.image.digest.osmSidecarInit | string | `"sha256:f87c4cf91b8ff6721133dce7ae889504b1061935a4d7b010f818b62b39268817"` | Sidecar init container's image digest |
| osm.image.name | object | `{"osmBootstrap":"osm-bootstrap","osmCRDs":"osm-crds","osmController":"osm-controller","osmHealthcheck":"osm-healthcheck","osmInjector":"osm-injector","osmPreinstall":"osm-preinstall","osmSidecarInit":"init"}` | Image name defaults |
| osm.image.name.osmBootstrap | string | `"osm-bootstrap"` | osm-boostrap's image name |
| osm.image.name.osmCRDs | string | `"osm-crds"` | osm-crds' image name |
Expand All @@ -124,7 +124,7 @@ The following table lists the configurable parameters of the osm chart and their
| osm.image.name.osmSidecarInit | string | `"init"` | Sidecar init container's image name |
| osm.image.pullPolicy | string | `"IfNotPresent"` | Container image pull policy for control plane containers |
| osm.image.registry | string | `"openservicemesh"` | Container image registry for control plane images |
| osm.image.tag | string | `"latest-main"` | Container image tag for control plane images |
| osm.image.tag | string | `"v1.1.0"` | Container image tag for control plane images |
| osm.imagePullSecrets | list | `[]` | `osm-controller` image pull secret |
| osm.inboundPortExclusionList | list | `[]` | Specifies a global list of ports to exclude from inbound traffic interception by the sidecar proxy. If specified, must be a list of positive integers. |
| osm.injector.autoScale | object | `{"cpu":{"targetAverageUtilization":80},"enable":false,"maxReplicas":5,"memory":{"targetAverageUtilization":80},"minReplicas":1}` | Auto scale configuration |
Expand Down
16 changes: 8 additions & 8 deletions charts/osm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ osm:
# -- Container image pull policy for control plane containers
pullPolicy: IfNotPresent
# -- Container image tag for control plane images
tag: "latest-main"
tag: ""
# -- Image name defaults
name:
# -- osm-controller's image name
Expand All @@ -32,19 +32,19 @@ osm:
# -- Image digest (defaults to latest compatible tag)
digest:
# -- osm-controller's image digest
osmController: ""
osmController: "sha256:afe9bac0cd67018cff956c4fa1bd1fd8792ffa7938e978a16f772f9fdb4f94f5"
# -- osm-injector's image digest
osmInjector: ""
osmInjector: "sha256:a6d688b3b2777a10b702b947528cb19e5a61ebca675b51d19457a96fd105d640"
# -- Sidecar init container's image digest
osmSidecarInit: ""
osmSidecarInit: "sha256:f87c4cf91b8ff6721133dce7ae889504b1061935a4d7b010f818b62b39268817"
# -- osm-crds' image digest
osmCRDs: ""
osmCRDs: "sha256:f5963ed9c41ad88f6be14d236d9aae5ec3f333a388ad4a992ff0afc9f374951d"
# -- osm-boostrap's image digest
osmBootstrap: ""
osmBootstrap: "sha256:6b1cbe1ba00c5d3c1ae0b2355b48e8efbcc44ce0a9c79324c36f3b1e43a54d61"
# -- osm-preinstall's image digest
osmPreinstall: ""
osmPreinstall: "sha256:704b1c8af9918b61585b3d7157acee28ff4dc1ecfd3d1b210b80cb688986f177"
# -- osm-healthcheck's image digest
osmHealthcheck: ""
osmHealthcheck: "sha256:b9caaa6926a8d7e6ca6f5551808d1c572ddcb7dc596fb039bdb326ade4539496"


# -- `osm-controller` image pull secret
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/e2e_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var _ = OSMDescribe("Upgrade from latest",
// release branches, it should specify the most recent patch of the
// previous minor release. e.g. on the release-v1.0 branch, this
// should be "0.11".
i.Version = ">0.0.0-0"
i.Version = "1.0"
i.Namespace = Td.OsmNamespace
i.Wait = true
i.ReleaseName = releaseName
Expand Down