github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-04-15 06:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1408 from fluxcd/helm-drift

Browse Source 
Disable Flux helm drift detection for managed resources
This commit is contained in:
Sanskar Jaiswal
2023-04-10 18:26:20 +05:30
committed by GitHub
parent f1def19f25 8229852585
commit 5b7a679944
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/router/kubernetes_default_test.go
+3 -3
View File
@@ -393,7 +393,7 @@ func TestServiceRouter_InitializeMetadata(t *testing.T) {
primarySvc, err := mocks.kubeClient.CoreV1().Services("default").Get(context.TODO(), "podinfo-primary", metav1.GetOptions{})
require.NoError(t, err)
assert.Equal(t, 1, len(primarySvc.Annotations))
assert.Equal(t, 2, len(primarySvc.Annotations))
assert.Equal(t, "podinfo-primary", primarySvc.Labels["app"])
}
@@ -425,12 +425,12 @@ func TestServiceRouter_ReconcileMetadata(t *testing.T) {
canarySvc, err := mocks.kubeClient.CoreV1().Services("default").Get(context.TODO(), "podinfo-canary", metav1.GetOptions{})
require.NoError(t, err)
assert.Equal(t, 1, len(canarySvc.Annotations))
assert.Equal(t, 2, len(canarySvc.Annotations))
assert.Equal(t, "podinfo-canary", canarySvc.Labels["app"])
primarySvc, err := mocks.kubeClient.CoreV1().Services("default").Get(context.TODO(), "podinfo-primary", metav1.GetOptions{})
require.NoError(t, err)
assert.Equal(t, 1, len(primarySvc.Annotations))
assert.Equal(t, 2, len(primarySvc.Annotations))
assert.Equal(t, "podinfo-primary", primarySvc.Labels["app"])
mocks.canary.Spec.Service.Apex = &flaggerv1.CustomMetadata{
pkg/router/util.go
+2
View File
@@ -7,6 +7,7 @@ import (
const (
toolkitMarker = "toolkit.fluxcd.io"
toolkitReconcileKey = "kustomize.toolkit.fluxcd.io/reconcile"
helmDriftDetectionKey = "helm.toolkit.fluxcd.io/driftDetection"
toolkitReconcileValue = "disabled"
)
@@ -30,5 +31,6 @@ func includeLabelsByPrefix(labels map[string]string, includeLabelPrefixes []stri
func filterMetadata(meta map[string]string) map[string]string {
// prevent Flux from overriding Flagger managed objects
meta[toolkitReconcileKey] = toolkitReconcileValue
meta[helmDriftDetectionKey] = toolkitReconcileValue
return meta
}
test/kubernetes/test-deployment.sh
+7
View File
@@ -93,6 +93,13 @@ if [ -z "$passed" ]; then
kubectl -n test get svc/podinfo-svc -oyaml
exit 1
fi
passed=$(kubectl -n test get svc/podinfo-svc -oyaml 2>&1 | { grep 'helm.toolkit.fluxcd.io/driftDetection' || true; })
if [ -z "$passed" ]; then
echo -e '\u2716 helm drift detection annotation test failed'
kubectl -n test get svc/podinfo-svc -oyaml
exit 1
fi
passed=$(kubectl -n test get deploy/podinfo-primary -oyaml 2>&1 | { grep test-label-prefix || true; })
if [ -z "$passed" ]; then
echo -e '\u2716 primary copy labels by prefix test failed'