revert: drop backwards compatibility

Signed-off-by: Bence Csati <bcsati@cisco.com>

Author: csatib02

e2e/deploy/workloads/daemonset.yaml

@@ -15,7 +15,6 @@ spec:
         secrets-webhook.security.bank-vaults.io/provider: "vault"
         secrets-webhook.security.bank-vaults.io/vault-addr: "https://vault:8200"
         secrets-webhook.security.bank-vaults.io/vault-tls-secret: vault-tls
-        alpha.vault.security.banzaicloud.io/reload-on-secret-change: "true"
         secrets-reloader.security.bank-vaults.io/reload-on-secret-change: "true"
     spec:
       initContainers:

pkg/reloader/controller.go

@@ -39,9 +39,6 @@ const (
 
 	SecretReloadAnnotationName = "secrets-reloader.security.bank-vaults.io/reload-on-secret-change"
 	ReloadCountAnnotationName  = "secrets-reloader.security.bank-vaults.io/secret-reload-count"
-
-	DeprecatedSecretReloadAnnotationName = "alpha.vault.security.banzaicloud.io/reload-on-secret-change"
-	DeprecatedReloadCountAnnotationName  = "alpha.vault.security.banzaicloud.io/secret-reload-count"
 )
 
 // Controller is the controller implementation for Foo resources
@@ -160,7 +157,7 @@ func (c *Controller) handleObject(obj interface{}) {
 	}
 
 	// Process workload, skip if reload annotation not present
-	if shouldProcessWorkload(podTemplateSpec.Annotations) {
+	if podTemplateSpec.GetAnnotations()[SecretReloadAnnotationName] != "true" {
 		return
 	}
 	c.logger.Debug(fmt.Sprintf("Processing workload: %#v", workloadData))
@@ -207,13 +204,9 @@ func (c *Controller) handleObjectDelete(obj interface{}) {
 	}
 
 	// Delete workload, skip if reload annotation not present
-	if shouldProcessWorkload(podTemplateSpec.Annotations) {
+	if podTemplateSpec.GetAnnotations()[SecretReloadAnnotationName] != "true" {
 		return
 	}
 	c.logger.Debug(fmt.Sprintf("Deleting workload from store: %#v", workloadData))
 	c.workloadSecrets.Delete(workloadData)
 }
-
-func shouldProcessWorkload(annotations map[string]string) bool {
-	return annotations[SecretReloadAnnotationName] == "true" || annotations[DeprecatedSecretReloadAnnotationName] == "true"
-}

pkg/reloader/reloader.go

@@ -154,26 +154,14 @@ func (c *Controller) reloadWorkload(workload workload) error {
 
 func incrementReloadCountAnnotation(podTemplate *corev1.PodTemplateSpec) {
 	version := "1"
-	annotationName := ReloadCountAnnotationName
-
-	// check for the current annotation
-	reloadCount, currentExists := podTemplate.GetAnnotations()[ReloadCountAnnotationName]
-	if !currentExists {
-		// check for deprecated annotation
-		if deprecatedReloadCount, deprecatedExists := podTemplate.GetAnnotations()[DeprecatedReloadCountAnnotationName]; deprecatedExists {
-			annotationName = DeprecatedReloadCountAnnotationName
-			reloadCount = deprecatedReloadCount
-		}
-	}
 
-	// parse and increment the reload count
-	if reloadCount != "" {
+	if reloadCount := podTemplate.GetAnnotations()[ReloadCountAnnotationName]; reloadCount != "" {
 		count, err := strconv.Atoi(reloadCount)
 		if err == nil {
 			count++
 			version = strconv.Itoa(count)
 		}
 	}
 
-	podTemplate.GetAnnotations()[annotationName] = version
+	podTemplate.GetAnnotations()[ReloadCountAnnotationName] = version
 }

pkg/reloader/reloader_test.go

@@ -25,53 +25,40 @@ import (
 func TestIncrementReloadCountAnnotation(t *testing.T) {
 	tests := []struct {
 		name              string
-		annotation        string
-		annotationValue   string
-		expectedAnnoation string
-		expectedValue     string
+		annotations       map[string]string
+		expectedAnnoation map[string]string
 	}{
 		{
-			name:              "no annotation should use the ReloadCountAnnotationName",
-			annotation:        "",
-			annotationValue:   "",
-			expectedAnnoation: ReloadCountAnnotationName,
-			expectedValue:     "1",
+			name:        "no annotation should add annotation",
+			annotations: map[string]string{},
+			expectedAnnoation: map[string]string{
+				ReloadCountAnnotationName: "1",
+			},
 		},
 		{
-			name:              "declared annotation should use the same annotation",
-			annotation:        ReloadCountAnnotationName,
-			annotationValue:   "1",
-			expectedAnnoation: ReloadCountAnnotationName,
-			expectedValue:     "2",
-		},
-		{
-			name:              "deprecated annotation should use the same annotation",
-			annotation:        DeprecatedReloadCountAnnotationName,
-			annotationValue:   "1",
-			expectedAnnoation: DeprecatedReloadCountAnnotationName,
-			expectedValue:     "2",
+			name: "existing annotation should increment annotation",
+			annotations: map[string]string{
+				ReloadCountAnnotationName: "1",
+			},
+			expectedAnnoation: map[string]string{
+				ReloadCountAnnotationName: "2",
+			},
 		},
 	}
 
 	for _, tt := range tests {
 		ttp := tt
 		t.Run(ttp.name, func(t *testing.T) {
-			annotations := map[string]string{}
-			if ttp.annotation != "" {
-				annotations[ttp.annotation] = ttp.annotationValue
-			}
 
 			podTemplateSpec := &corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Annotations: annotations,
+					Annotations: ttp.annotations,
 				},
 			}
 
 			incrementReloadCountAnnotation(podTemplateSpec)
 
-			annotationValue, ok := podTemplateSpec.Annotations[ttp.expectedAnnoation]
-			assert.True(t, ok)
-			assert.Equal(t, ttp.expectedValue, annotationValue)
+			assert.Equal(t, ttp.expectedAnnoation, podTemplateSpec.Annotations)
 		})
 	}
 }