Skip to content

Commit 0aec478

Browse files
committed
skip flux labels and annotations propogation
1 parent eb0241f commit 0aec478

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

controllers/externalconfigmap_controller.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"k8s.io/apimachinery/pkg/runtime"
1212
ctrl "sigs.k8s.io/controller-runtime"
1313
"sigs.k8s.io/controller-runtime/pkg/client"
14+
"strings"
1415
"time"
1516
)
1617

@@ -107,9 +108,15 @@ func (r *ExternalConfigMapReconciler) constructConfigMap(externalConfigMap *exte
107108
Data: values,
108109
}
109110
for k, v := range externalConfigMap.Annotations {
111+
if strings.Contains(k, "fluxcd.io") || strings.Contains(k, "last-applied-configuration") {
112+
continue
113+
}
110114
configMap.Annotations[k] = v
111115
}
112116
for k, v := range externalConfigMap.Labels {
117+
if strings.Contains(k, "fluxcd.io") {
118+
continue
119+
}
113120
configMap.Labels[k] = v
114121
}
115122
if err := ctrl.SetControllerReference(externalConfigMap, configMap, r.Scheme); err != nil {

controllers/externalsecret_controller.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"external-secrets-operator/internal"
77
corev1 "k8s.io/api/core/v1"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
9+
"strings"
910
"time"
1011

1112
"github.com/go-logr/logr"
@@ -109,9 +110,15 @@ func (r *ExternalSecretReconciler) constructSecret(externalSecret *externalsecre
109110
StringData: values,
110111
}
111112
for k, v := range externalSecret.Annotations {
113+
if strings.Contains(k, "fluxcd.io") || strings.Contains(k, "last-applied-configuration") {
114+
continue
115+
}
112116
secret.Annotations[k] = v
113117
}
114118
for k, v := range externalSecret.Labels {
119+
if strings.Contains(k, "fluxcd.io") {
120+
continue
121+
}
115122
secret.Labels[k] = v
116123
}
117124
if err := ctrl.SetControllerReference(externalSecret, secret, r.Scheme); err != nil {

0 commit comments

Comments
 (0)