From 78a61675ee76996c4950561c37e17c1c198d0d0b Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Mon, 28 Oct 2019 13:21:59 -0400 Subject: [PATCH] Change label for stack (#169) * Change label for stack * Add stack label change and canary deployment documentation to change log * Update change log * Update link to PR in change log * Add link to version 0.2.1 --- CHANGELOG.md | 13 ++++++++++++- doc/user-guide.md | 2 +- .../appsody/v1beta1/appsodyapplication_types.go | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db30095..b4999c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,16 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [0.2.1] + +### Added + +- Added documentation on how to do canary testing with the standard `Route` resource. ([#143](https://github.com/appsody/appsody-operator/issues/143)) + +### Changed + +- Changed the label corresponding to the Appsody Stack information from `app.appsody.dev/stack` to `stack.appsody.dev/id`. ([#169](https://github.com/appsody/appsody-operator/issues/169)) + ## [0.2.0] ### Added @@ -33,6 +43,7 @@ All notable changes to this project will be documented in this file. The initial release of the Appsody Operator 🎉🥳 -[Unreleased]: https://github.com/appsody/appsody-operator/compare/v0.2.0...HEAD +[Unreleased]: https://github.com/appsody/appsody-operator/compare/v0.2.1...HEAD +[0.2.1]: https://github.com/appsody/appsody-operator/compare/v0.2.0...v0.2.1 [0.2.0]: https://github.com/appsody/appsody-operator/compare/v0.1.0...v0.2.0 [0.1.0]: https://github.com/appsody/appsody-operator/releases/tag/v0.1.0 \ No newline at end of file diff --git a/doc/user-guide.md b/doc/user-guide.md index 95304c1..c7e88e1 100644 --- a/doc/user-guide.md +++ b/doc/user-guide.md @@ -107,7 +107,7 @@ If applications require specific permissions but still want the operator to crea ### Labels -By default, the operator adds the following labels into all resources created for an `AppsodyApplication` CR: `app.kubernetes.io/name`, `app.kubernetes.io/managed-by`, `app.appsody.dev/stack` and `app.kubernetes.io/version` (only when `version` is defined). You can set new labels in addition to the pre-existing ones or overwrite them, excluding the `app.kubernetes.io/name` label. To set labels, specify them in your CR as key/value pairs. +By default, the operator adds the following labels into all resources created for an `AppsodyApplication` CR: `app.kubernetes.io/name`, `app.kubernetes.io/managed-by`, `app.kubernetes.io/version` (when `version` is defined) and `stack.appsody.dev/id` (when `stack` is defined). You can set new labels in addition to the pre-existing ones or overwrite them, excluding the `app.kubernetes.io/name` label. To set labels, specify them in your CR as key/value pairs. ```yaml apiVersion: appsody.dev/v1beta1 diff --git a/pkg/apis/appsody/v1beta1/appsodyapplication_types.go b/pkg/apis/appsody/v1beta1/appsodyapplication_types.go index be9b911..f749b00 100644 --- a/pkg/apis/appsody/v1beta1/appsodyapplication_types.go +++ b/pkg/apis/appsody/v1beta1/appsodyapplication_types.go @@ -522,7 +522,7 @@ func (cr *AppsodyApplication) GetLabels() map[string]string { } if cr.Spec.Stack != "" { - labels["app.appsody.dev/stack"] = cr.Spec.Stack + labels["stack.appsody.dev/id"] = cr.Spec.Stack } if cr.Spec.Version != "" {