Skip to content

Commit a0b3b74

Browse files
authored
fix: Standardize 'app.kubernetes.io/part-of' labels across all ArgoCD resources (argoproj-labs#1686)
* fix: update ApplicationSet label to match upstream Argo CD Signed-off-by: Atif Ali <atali@redhat.com> * fix e2e test failure Signed-off-by: Atif Ali <atali@redhat.com> --------- Signed-off-by: Atif Ali <atali@redhat.com>
1 parent bef3cd9 commit a0b3b74

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

controllers/argocd/applicationset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ func getApplicationSetResources(cr *argoproj.ArgoCD) corev1.ResourceRequirements
891891

892892
func setAppSetLabels(obj *metav1.ObjectMeta) {
893893
obj.Labels["app.kubernetes.io/name"] = "argocd-applicationset-controller"
894-
obj.Labels["app.kubernetes.io/part-of"] = "argocd-applicationset"
894+
obj.Labels["app.kubernetes.io/part-of"] = "argocd"
895895
obj.Labels["app.kubernetes.io/component"] = "controller"
896896
}
897897

controllers/argocd/applicationset_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ func TestReconcileApplicationSet_RoleBinding(t *testing.T) {
978978

979979
func appsetAssertExpectedLabels(t *testing.T, meta *metav1.ObjectMeta) {
980980
assert.Equal(t, meta.Labels["app.kubernetes.io/name"], "argocd-applicationset-controller")
981-
assert.Equal(t, meta.Labels["app.kubernetes.io/part-of"], "argocd-applicationset")
981+
assert.Equal(t, meta.Labels["app.kubernetes.io/part-of"], "argocd")
982982
assert.Equal(t, meta.Labels["app.kubernetes.io/component"], "controller")
983983
}
984984

tests/k8s/1-033_validate_applicationset_tls_scm_volume_mount/01-assert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ metadata:
2222
app.kubernetes.io/component: controller
2323
app.kubernetes.io/managed-by: argocd
2424
app.kubernetes.io/name: argocd-applicationset-controller
25-
app.kubernetes.io/part-of: argocd-applicationset
25+
app.kubernetes.io/part-of: argocd
2626
spec:
2727
selector:
2828
matchLabels:

0 commit comments

Comments
 (0)