From 7ea8c591d0d76167410270271bfd7f19e37a79ad Mon Sep 17 00:00:00 2001 From: Albert Teoh Date: Sun, 9 Aug 2020 18:52:37 +1000 Subject: [PATCH 1/4] fix custom labels support Signed-off-by: Albert Teoh --- pkg/deployment/all_in_one.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/deployment/all_in_one.go b/pkg/deployment/all_in_one.go index 8cd172a2b..f0bb21fdd 100644 --- a/pkg/deployment/all_in_one.go +++ b/pkg/deployment/all_in_one.go @@ -120,7 +120,7 @@ func (a *AllInOne) Get() *appsv1.Deployment { }, Spec: appsv1.DeploymentSpec{ Selector: &metav1.LabelSelector{ - MatchLabels: labels, + MatchLabels: commonSpec.Labels, }, Template: corev1.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ From 83fc2b9ebb6190f672d1902a10918770b2b04662 Mon Sep 17 00:00:00 2001 From: Albert Teoh Date: Tue, 11 Aug 2020 20:31:10 +1000 Subject: [PATCH 2/4] gofmt Signed-off-by: Albert Teoh --- pkg/storage/elasticsearch_dependencies.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/storage/elasticsearch_dependencies.go b/pkg/storage/elasticsearch_dependencies.go index e32e8b3a4..bc041841a 100644 --- a/pkg/storage/elasticsearch_dependencies.go +++ b/pkg/storage/elasticsearch_dependencies.go @@ -7,10 +7,10 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/jaegertracing/jaeger-operator/pkg/account" v1 "github.com/jaegertracing/jaeger-operator/pkg/apis/jaegertracing/v1" "github.com/jaegertracing/jaeger-operator/pkg/cronjob" "github.com/jaegertracing/jaeger-operator/pkg/util" - "github.com/jaegertracing/jaeger-operator/pkg/account" ) // EnableRollover returns true if rollover should be enabled @@ -45,12 +45,12 @@ func elasticsearchDependencies(jaeger *v1.Jaeger) []batchv1.Job { Labels: commonSpec.Labels, }, Spec: corev1.PodSpec{ - RestartPolicy: corev1.RestartPolicyOnFailure, + RestartPolicy: corev1.RestartPolicyOnFailure, Affinity: commonSpec.Affinity, Tolerations: commonSpec.Tolerations, SecurityContext: commonSpec.SecurityContext, ServiceAccountName: account.JaegerServiceAccountFor(jaeger, account.EsRolloverComponent), - Volumes: commonSpec.Volumes, + Volumes: commonSpec.Volumes, Containers: []corev1.Container{ { Name: name, From 75cb0c859e1e604a9b2bc3d684ad73d9146f4837 Mon Sep 17 00:00:00 2001 From: Albert Teoh Date: Tue, 11 Aug 2020 21:04:03 +1000 Subject: [PATCH 3/4] Add test to check selector Signed-off-by: Albert Teoh --- go.sum | 1 + pkg/deployment/all_in_one_test.go | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/go.sum b/go.sum index 8880c93ac..3ce01dd2d 100644 --- a/go.sum +++ b/go.sum @@ -1431,6 +1431,7 @@ k8s.io/apimachinery v0.18.2 h1:44CmtbmkzVDAhCpRVSiP2R5PPrC2RtlIv/MoB8xpdRA= k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.18.3 h1:pOGcbVAhxADgUYnjS08EFXs9QMl8qaH5U4fr5LGUrSk= k8s.io/apimachinery v0.18.3/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= +k8s.io/apimachinery v0.18.6 h1:RtFHnfGNfd1N0LeSrKCUznz5xtUP1elRGvHJbL3Ntag= k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad/go.mod h1:XPCXEwhjaFN29a8NldXA901ElnKeKLrLtREO9ZhFyhg= k8s.io/apiserver v0.0.0-20191122221311-9d521947b1e1/go.mod h1:RbsZY5zzBIWnz4KbctZsTVjwIuOpTp4Z8oCgFHN4kZQ= k8s.io/apiserver v0.18.0/go.mod h1:3S2O6FeBBd6XTo0njUrLxiqk8GNy6wWOftjhJcXYnjw= diff --git a/pkg/deployment/all_in_one_test.go b/pkg/deployment/all_in_one_test.go index 94a35a26c..023c0a8cb 100644 --- a/pkg/deployment/all_in_one_test.go +++ b/pkg/deployment/all_in_one_test.go @@ -83,6 +83,11 @@ func TestAllInOneLabels(t *testing.T) { assert.Equal(t, "operator", dep.Spec.Template.Labels["name"]) assert.Equal(t, "world", dep.Spec.Template.Labels["hello"]) assert.Equal(t, "false", dep.Spec.Template.Labels["another"]) + + // Deployment selectors should be the same as the template labels. + assert.Equal(t, "operator", dep.Spec.Selector.MatchLabels["name"]) + assert.Equal(t, "world", dep.Spec.Selector.MatchLabels["hello"]) + assert.Equal(t, "false", dep.Spec.Selector.MatchLabels["another"]) } func TestAllInOneHasOwner(t *testing.T) { From 417f25f0d640c9a775bb2324bb56c74ac4999cdb Mon Sep 17 00:00:00 2001 From: Albert Teoh Date: Wed, 12 Aug 2020 18:33:59 +1000 Subject: [PATCH 4/4] Remove labels var Signed-off-by: Albert Teoh --- pkg/deployment/all_in_one.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/deployment/all_in_one.go b/pkg/deployment/all_in_one.go index f0bb21fdd..afed8d715 100644 --- a/pkg/deployment/all_in_one.go +++ b/pkg/deployment/all_in_one.go @@ -37,7 +37,6 @@ func NewAllInOne(jaeger *v1.Jaeger) *AllInOne { // Get returns a pod for the current all-in-one configuration func (a *AllInOne) Get() *appsv1.Deployment { a.jaeger.Logger().Debug("Assembling an all-in-one deployment") - labels := a.labels() trueVar := true args := append(a.jaeger.Spec.AllInOne.Options.ToArgs()) @@ -51,7 +50,7 @@ func (a *AllInOne) Get() *appsv1.Deployment { "sidecar.istio.io/inject": "false", "linkerd.io/inject": "disabled", }, - Labels: labels, + Labels: a.labels(), } commonSpec := util.Merge([]v1.JaegerCommonSpec{a.jaeger.Spec.AllInOne.JaegerCommonSpec, a.jaeger.Spec.JaegerCommonSpec, baseCommonSpec})