Merge pull request #16700 from bparees/s2i-df6fb76a-bump

Automatic merge from submit-queue (batch tested with PRs 16700, 16696, 16698, 16661, 16704).

Ensure user supplied labels override existing image labels during builds

Author: openshift-merge-robot

Godeps/Godeps.json

@@ -113,6 +113,11 @@ func ExpectOpenShiftLabels(labels map[string]string) error {
 			return fmt.Errorf("Built image doesn't contain proper Docker image labels. Missing %q label", label)
 		}
 	}
-
+	if labels["io.k8s.display-name"] != "overridden" {
+		return fmt.Errorf("Existing label was not overridden with user specified value: %s=%s", labels["io.k8s.display-name"], labels["overridden"])
+	}
+	if labels["io.openshift.builder-version"] != "overridden2" {
+		return fmt.Errorf("System generated label was not overridden with user specified value: %s=%s", labels["io.openshift.builder-version"], labels["overridden2"])
+	}
 	return nil
 }

test/extended/builds/labels.go

@@ -34,6 +34,14 @@
         {
           "name": "user-specified-label",
           "value": "arbitrary-value"
+        },
+        {
+          "name": "io.k8s.display-name",
+          "value": "overridden"
+        },
+        {
+          "name": "io.openshift.builder-version",
+          "value": "overridden2"
         }
       ]
     }

test/extended/testdata/bindata.go

@@ -40,6 +40,14 @@
         {
           "name": "user-specified-label",
           "value": "arbitrary-value"
+        },
+        {
+          "name": "io.k8s.display-name",
+          "value": "overridden"
+        },
+        {
+          "name": "io.openshift.builder-version",
+          "value": "overridden2"
         }
       ]
     }