Merge pull request #162 from keel-hq/feature/change_cause

setting change cause for versioned deployment
keel-hq · Mar 17, 2018 · 9fb820d · 9fb820d
2 parents cf1c4cc + 1ba25ad
commit 9fb820d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 24 deletions.
diff --git a/provider/kubernetes/approvals_test.go b/provider/kubernetes/approvals_test.go
@@ -28,9 +28,10 @@ func TestCheckRequestedApproval(t *testing.T) {
 			v1beta1.Deployment{
 				meta_v1.TypeMeta{},
 				meta_v1.ObjectMeta{
-					Name:      "dep-1",
-					Namespace: "xxxx",
-					Labels:    map[string]string{types.KeelPolicyLabel: "all", types.KeelMinimumApprovalsLabel: "1"},
+					Name:        "dep-1",
+					Namespace:   "xxxx",
+					Labels:      map[string]string{types.KeelPolicyLabel: "all", types.KeelMinimumApprovalsLabel: "1"},
+					Annotations: map[string]string{},
 				},
 				v1beta1.DeploymentSpec{
 					Template: v1.PodTemplateSpec{
@@ -95,9 +96,10 @@ func TestApprovedCheck(t *testing.T) {
 			v1beta1.Deployment{
 				meta_v1.TypeMeta{},
 				meta_v1.ObjectMeta{
-					Name:      "dep-1",
-					Namespace: "xxxx",
-					Labels:    map[string]string{types.KeelPolicyLabel: "all", types.KeelMinimumApprovalsLabel: "1"},
+					Name:        "dep-1",
+					Namespace:   "xxxx",
+					Labels:      map[string]string{types.KeelPolicyLabel: "all", types.KeelMinimumApprovalsLabel: "1"},
+					Annotations: map[string]string{},
 				},
 				v1beta1.DeploymentSpec{
 					Template: v1.PodTemplateSpec{

diff --git a/provider/kubernetes/kubernetes.go b/provider/kubernetes/kubernetes.go
@@ -220,6 +220,7 @@ func (p *Provider) updateDeployments(plans []*UpdatePlan) (updated []*v1beta1.De
 			err = p.forceUpdate(&deployment)
 		} else {
 			// regular update
+			deployment.Annotations["kubernetes.io/change-cause"] = fmt.Sprintf("keel automated update, version %s -> %s", plan.CurrentVersion, plan.NewVersion)
 			err = p.implementer.Update(&deployment)
 		}
 		if err != nil {

diff --git a/provider/kubernetes/kubernetes_test.go b/provider/kubernetes/kubernetes_test.go
@@ -315,9 +315,10 @@ func TestProcessEvent(t *testing.T) {
 			v1beta1.Deployment{
 				meta_v1.TypeMeta{},
 				meta_v1.ObjectMeta{
-					Name:      "deployment-1",
-					Namespace: "xxxx",
-					Labels:    map[string]string{types.KeelPolicyLabel: "all"},
+					Name:        "deployment-1",
+					Namespace:   "xxxx",
+					Labels:      map[string]string{types.KeelPolicyLabel: "all"},
+					Annotations: map[string]string{},
 				},
 				v1beta1.DeploymentSpec{
 					Template: v1.PodTemplateSpec{
@@ -335,9 +336,10 @@ func TestProcessEvent(t *testing.T) {
 			v1beta1.Deployment{
 				meta_v1.TypeMeta{},
 				meta_v1.ObjectMeta{
-					Name:      "deployment-2",
-					Namespace: "xxxx",
-					Labels:    map[string]string{"whatever": "all"},
+					Name:        "deployment-2",
+					Namespace:   "xxxx",
+					Labels:      map[string]string{"whatever": "all"},
+					Annotations: map[string]string{},
 				},
 				v1beta1.DeploymentSpec{
 					Template: v1.PodTemplateSpec{
@@ -393,9 +395,10 @@ func TestProcessEventBuildNumber(t *testing.T) {
 			v1beta1.Deployment{
 				meta_v1.TypeMeta{},
 				meta_v1.ObjectMeta{
-					Name:      "deployment-1",
-					Namespace: "xxxx",
-					Labels:    map[string]string{types.KeelPolicyLabel: "all"},
+					Name:        "deployment-1",
+					Namespace:   "xxxx",
+					Labels:      map[string]string{types.KeelPolicyLabel: "all"},
+					Annotations: map[string]string{},
 				},
 				v1beta1.DeploymentSpec{
 					Template: v1.PodTemplateSpec{
@@ -452,9 +455,10 @@ func TestGetImpactedTwoContainersInSameDeployment(t *testing.T) {
 			v1beta1.Deployment{
 				meta_v1.TypeMeta{},
 				meta_v1.ObjectMeta{
-					Name:      "dep-1",
-					Namespace: "xxxx",
-					Labels:    map[string]string{types.KeelPolicyLabel: "all"},
+					Name:        "dep-1",
+					Namespace:   "xxxx",
+					Labels:      map[string]string{types.KeelPolicyLabel: "all"},
+					Annotations: map[string]string{},
 				},
 				v1beta1.DeploymentSpec{
 					Template: v1.PodTemplateSpec{
@@ -549,9 +553,10 @@ func TestGetImpactedTwoSameContainersInSameDeployment(t *testing.T) {
 			v1beta1.Deployment{
 				meta_v1.TypeMeta{},
 				meta_v1.ObjectMeta{
-					Name:      "dep-1",
-					Namespace: "xxxx",
-					Labels:    map[string]string{types.KeelPolicyLabel: "all"},
+					Name:        "dep-1",
+					Namespace:   "xxxx",
+					Labels:      map[string]string{types.KeelPolicyLabel: "all"},
+					Annotations: map[string]string{},
 				},
 				v1beta1.DeploymentSpec{
 					Template: v1.PodTemplateSpec{
@@ -572,9 +577,10 @@ func TestGetImpactedTwoSameContainersInSameDeployment(t *testing.T) {
 			v1beta1.Deployment{
 				meta_v1.TypeMeta{},
 				meta_v1.ObjectMeta{
-					Name:      "dep-2",
-					Namespace: "xxxx",
-					Labels:    map[string]string{"whatever": "all"},
+					Name:        "dep-2",
+					Namespace:   "xxxx",
+					Labels:      map[string]string{"whatever": "all"},
+					Annotations: map[string]string{},
 				},
 				v1beta1.DeploymentSpec{
 					Template: v1.PodTemplateSpec{