Fix not matching first selector label

Signed-off-by: Kevin Snyder <[email protected]>

Author: KevinSnyderCodes

pkg/canary/daemonset_controller.go

@@ -316,6 +316,7 @@ func (c *DaemonSetController) getSelectorLabel(daemonSet *appsv1.DaemonSet) (map
 	for _, l := range c.labels {
 		if _, ok := daemonSet.Spec.Selector.MatchLabels[l]; ok {
 			label, labelValue = l, daemonSet.Spec.Selector.MatchLabels[l]
+			break
 		}
 	}
 

pkg/canary/daemonset_controller_test.go

@@ -72,6 +72,29 @@ func TestDaemonSetController_Sync_InconsistentNaming(t *testing.T) {
 	assert.Equal(t, primarySelectorValue, fmt.Sprintf("%s-primary", sourceSelectorValue))
 }
 
+func TestDaemonSetController_GetMetadata(t *testing.T) {
+	dc := daemonsetConfigs{name: "podinfo", label: "name", labelValue: "podinfo"}
+	mocks := newDaemonSetFixture(dc)
+	_, err := mocks.controller.Initialize(mocks.canary)
+	require.NoError(t, err)
+
+	matchLabels, label, labelValue, _, err := mocks.controller.GetMetadata(mocks.canary)
+	require.NoError(t, err)
+
+	assert.Equal(t, map[string]string{"name": "podinfo", "test-label-1": "test-label-value-1"}, matchLabels)
+	assert.Equal(t, "name", label)
+	assert.Equal(t, "podinfo", labelValue)
+
+	mocks.controller.labels = []string{"app", "name", "test-label-1"}
+
+	matchLabels, label, labelValue, _, err = mocks.controller.GetMetadata(mocks.canary)
+	require.NoError(t, err)
+
+	assert.Equal(t, map[string]string{"name": "podinfo", "test-label-1": "test-label-value-1"}, matchLabels)
+	assert.Equal(t, "name", label)
+	assert.Equal(t, "podinfo", labelValue)
+}
+
 func TestDaemonSetController_Initialize(t *testing.T) {
 	dc := daemonsetConfigs{name: "podinfo", label: "name", labelValue: "podinfo"}
 	mocks := newDaemonSetFixture(dc)

pkg/canary/deployment_controller.go

@@ -332,6 +332,7 @@ func (c *DeploymentController) getSelectorLabel(deployment *appsv1.Deployment) (
 	for _, l := range c.labels {
 		if _, ok := deployment.Spec.Selector.MatchLabels[l]; ok {
 			label, labelValue = l, deployment.Spec.Selector.MatchLabels[l]
+			break
 		}
 	}
 

pkg/canary/deployment_controller_test.go

@@ -69,6 +69,28 @@ func TestDeploymentController_Sync_InconsistentNaming(t *testing.T) {
 	assert.Equal(t, primarySelectorValue, fmt.Sprintf("%s-primary", dc.labelValue))
 }
 
+func TestDeploymentController_GetMetadata(t *testing.T) {
+	dc := deploymentConfigs{name: "podinfo", label: "name", labelValue: "podinfo"}
+	mocks := newDeploymentFixture(dc)
+	mocks.initializeCanary(t)
+
+	matchLabels, label, labelValue, _, err := mocks.controller.GetMetadata(mocks.canary)
+	require.NoError(t, err)
+
+	assert.Equal(t, map[string]string{"name": "podinfo", "test-label-1": "test-label-value-1"}, matchLabels)
+	assert.Equal(t, "name", label)
+	assert.Equal(t, "podinfo", labelValue)
+
+	mocks.controller.labels = []string{"app", "name", "test-label-1"}
+
+	matchLabels, label, labelValue, _, err = mocks.controller.GetMetadata(mocks.canary)
+	require.NoError(t, err)
+
+	assert.Equal(t, map[string]string{"name": "podinfo", "test-label-1": "test-label-value-1"}, matchLabels)
+	assert.Equal(t, "name", label)
+	assert.Equal(t, "podinfo", labelValue)
+}
+
 func TestDeploymentController_Initialize(t *testing.T) {
 	dc := deploymentConfigs{name: "podinfo", label: "name", labelValue: "podinfo"}
 	mocks := newDeploymentFixture(dc)