Add custom resource label for AppDeployment instead of directly in Bl…

…ueGreen
mattermost · Apr 24, 2020 · 87bf095 · 87bf095
1 parent d59b0cd
commit 87bf095
Show file tree

Hide file tree

Showing 51 changed files with 1,168 additions and 2,516 deletions.
diff --git a/deploy/crds/mattermost.com_clusterinstallations_crd.yaml b/deploy/crds/mattermost.com_clusterinstallations_crd.yaml
@@ -643,6 +643,10 @@ spec:
                     name:
                       description: Name defines the name of the deployment
                       type: string
+                    resourceLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     version:
                       description: Version defines the Docker image version that will
                         be used for the deployment. Required when BlueGreen or Canary
@@ -668,6 +672,10 @@ spec:
                     name:
                       description: Name defines the name of the deployment
                       type: string
+                    resourceLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     version:
                       description: Version defines the Docker image version that will
                         be used for the deployment. Required when BlueGreen or Canary
@@ -678,10 +686,6 @@ spec:
                   description: ProductionDeployment defines if the current production
                     is blue or green.
                   type: string
-                resourceLabels:
-                  additionalProperties:
-                    type: string
-                  type: object
               type: object
             canary:
               description: Canary defines the configuration of Canary deployment for
@@ -703,6 +707,10 @@ spec:
                     name:
                       description: Name defines the name of the deployment
                       type: string
+                    resourceLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     version:
                       description: Version defines the Docker image version that will
                         be used for the deployment. Required when BlueGreen or Canary

diff --git a/docs/mattermost-operator/mattermost-operator.yaml b/docs/mattermost-operator/mattermost-operator.yaml
@@ -648,6 +648,10 @@ spec:
                     name:
                       description: Name defines the name of the deployment
                       type: string
+                    resourceLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     version:
                       description: Version defines the Docker image version that will
                         be used for the deployment. Required when BlueGreen or Canary
@@ -673,6 +677,10 @@ spec:
                     name:
                       description: Name defines the name of the deployment
                       type: string
+                    resourceLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     version:
                       description: Version defines the Docker image version that will
                         be used for the deployment. Required when BlueGreen or Canary
@@ -683,10 +691,6 @@ spec:
                   description: ProductionDeployment defines if the current production
                     is blue or green.
                   type: string
-                resourceLabels:
-                  additionalProperties:
-                    type: string
-                  type: object
               type: object
             canary:
               description: Canary defines the configuration of Canary deployment for
@@ -708,6 +712,10 @@ spec:
                     name:
                       description: Name defines the name of the deployment
                       type: string
+                    resourceLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     version:
                       description: Version defines the Docker image version that will
                         be used for the deployment. Required when BlueGreen or Canary

diff --git a/go.mod b/go.mod
@@ -29,7 +29,7 @@ require (
 	golang.org/x/crypto v0.0.0-20200117160349-530e935923ad // indirect
 	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
 	golang.org/x/sys v0.0.0-20200122134326-e047566fdf82 // indirect
-	golang.org/x/tools v0.0.0-20200417140056-c07e33ef3290 // indirect
+	golang.org/x/tools v0.0.0-20200423205358-59e73619c742 // indirect
 	k8s.io/api v0.17.2
 	k8s.io/apimachinery v0.17.2
 	k8s.io/client-go v12.0.0+incompatible

diff --git a/go.sum b/go.sum
@@ -1009,6 +1009,8 @@ golang.org/x/tools v0.0.0-20200327172716-42235f63843a h1:nZPvz874FG8d8iARpJWCyVt
 golang.org/x/tools v0.0.0-20200327172716-42235f63843a/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200417140056-c07e33ef3290 h1:NXNmtp0ToD36cui5IqWy95LC4Y6vT/4y3RnPxlQPinU=
 golang.org/x/tools v0.0.0-20200417140056-c07e33ef3290/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200423205358-59e73619c742 h1:9OGWpORUXvk8AsaBJlpzzDx7Srv/rSK6rvjcsJq4rJo=
+golang.org/x/tools v0.0.0-20200423205358-59e73619c742/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

diff --git a/pkg/apis/mattermost/v1alpha1/clusterinstallation_types.go b/pkg/apis/mattermost/v1alpha1/clusterinstallation_types.go
@@ -111,9 +111,6 @@ type BlueGreen struct {
 	// Green defines the green deployment.
 	// +optional
 	Green AppDeployment `json:"green,omitempty"`
-
-	// +optional
-	ResourceLabels map[string]string `json:"resourceLabels,omitempty"`
 }
 
 // AppDeployment defines the configuration of deployment for a ClusterInstallation.
@@ -133,6 +130,9 @@ type AppDeployment struct {
 	// Required when BlueGreen or Canary is enabled.
 	// +optional
 	Version string `json:"version,omitempty"`
+
+	// +optional
+	ResourceLabels map[string]string `json:"resourceLabels,omitempty"`
 }
 
 // Minio defines the configuration of Minio for a ClusterInstallation.

diff --git a/pkg/apis/mattermost/v1alpha1/clusterinstallation_utils.go b/pkg/apis/mattermost/v1alpha1/clusterinstallation_utils.go
@@ -698,13 +698,20 @@ func (mattermost *ClusterInstallation) ClusterInstallationLabels(name string) ma
 	l := ClusterInstallationResourceLabels(name)
 	l[ClusterLabel] = name
 	l["app"] = "mattermost"
-	if mattermost.Spec.BlueGreen.Enable && len(mattermost.Spec.BlueGreen.ResourceLabels) != 0 {
-		for k, v := range mattermost.Spec.BlueGreen.ResourceLabels {
-			l[k] = v
+
+	labels := map[string]string{}
+	if mattermost.Spec.BlueGreen.Enable {
+		if mattermost.Spec.BlueGreen.ProductionDeployment == BlueName {
+			labels = mattermost.Spec.BlueGreen.Blue.ResourceLabels
 		}
-		return l
+		if mattermost.Spec.BlueGreen.ProductionDeployment == GreenName {
+			labels = mattermost.Spec.BlueGreen.Green.ResourceLabels
+		}
+	} else {
+		labels = mattermost.Spec.ResourceLabels
 	}
-	for k, v := range mattermost.Spec.ResourceLabels {
+
+	for k, v := range labels {
 		l[k] = v
 	}
 	return l

diff --git a/pkg/apis/mattermost/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/mattermost/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
diff --git a/pkg/client/clientset/versioned/fake/doc.go b/pkg/client/clientset/versioned/fake/doc.go
diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go