1Password/onepassword-operator
1
0
Fork 0
mirror of https://github.com/1Password/onepassword-operator.git synced 2025-10-22 07:28:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from 1Password/ignore_restart_annotation

Browse Source 
Ignore restart annotation when looking for 1Password annotations
This commit is contained in:
Jillian W
2021-01-13 17:24:29 -04:00
committed by GitHub
parent 143b6f9403 76ee62519e
commit 9f708729a8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/deployment/deployment_controller.go
View File

@@ -99,7 +99,7 @@ func (r *ReconcileDeployment) Reconcile(request reconcile.Request) (reconcile.Re
annotations, annotationsFound := op.GetAnnotationsForDeployment(deployment, r.opAnnotationRegExp) annotations, annotationsFound := op.GetAnnotationsForDeployment(deployment, r.opAnnotationRegExp)
if !annotationsFound { if !annotationsFound {
reqLogger.Info("No One Password Annotations found") reqLogger.Info("No 1Password Annotations found")
return reconcile.Result{}, nil return reconcile.Result{}, nil
} }

2
pkg/onepassword/annotations.go
View File

@@ -34,7 +34,7 @@ func GetAnnotationsForDeployment(deployment *appsv1.Deployment, regex *regexp.Re
func FilterAnnotations(annotations map[string]string, regex *regexp.Regexp) map[string]string { func FilterAnnotations(annotations map[string]string, regex *regexp.Regexp) map[string]string {
filteredAnnotations := make(map[string]string) filteredAnnotations := make(map[string]string)
for key, value := range annotations { for key, value := range annotations {
if regex.MatchString(key) { if regex.MatchString(key) && key != RestartAnnotation {
filteredAnnotations[key] = value filteredAnnotations[key] = value
} }
} }