Arbitrary image labels: generated files

openshift · Oct 7, 2016 · aff38d0 · aff38d0
1 parent 48d3719
commit aff38d0
Show file tree

Hide file tree

Showing 11 changed files with 594 additions and 210 deletions.
diff --git a/api/protobuf-spec/github_com_openshift_origin_pkg_build_api_v1.proto b/api/protobuf-spec/github_com_openshift_origin_pkg_build_api_v1.proto
diff --git a/api/swagger-spec/oapi-v1.json b/api/swagger-spec/oapi-v1.json
@@ -22071,6 +22071,30 @@
      "pushSecret": {
       "$ref": "v1.LocalObjectReference",
       "description": "PushSecret is the name of a Secret that would be used for setting up the authentication for executing the Docker push to authentication enabled Docker Registry (or Docker Hub)."
+     },
+     "imageLabels": {
+      "type": "array",
+      "items": {
+       "$ref": "v1.ImageLabel"
+      },
+      "description": "imageLabels define a list of labels that are applied to the resulting image. If there are multiple labels with the same name then the last one in the list is used."
+     }
+    }
+   },
+   "v1.ImageLabel": {
+    "id": "v1.ImageLabel",
+    "description": "ImageLabel represents a label applied to the resulting image.",
+    "required": [
+     "name"
+    ],
+    "properties": {
+     "name": {
+      "type": "string",
+      "description": "name defines the name of the label. It must have non-zero length."
+     },
+     "value": {
+      "type": "string",
+      "description": "value defines the literal value of the label."
      }
     }
    },

diff --git a/api/swagger-spec/openshift-openapi-spec.json b/api/swagger-spec/openshift-openapi-spec.json
@@ -44770,6 +44770,13 @@
    "v1.BuildOutput": {
     "description": "BuildOutput is input to a build strategy and describes the Docker image that the strategy should produce.",
     "properties": {
+     "imageLabels": {
+      "description": "imageLabels define a list of labels that are applied to the resulting image. If there are multiple labels with the same name then the last one in the list is used.",
+      "type": "array",
+      "items": {
+       "$ref": "#/definitions/v1.ImageLabel"
+      }
+     },
      "pushSecret": {
       "$ref": "#/definitions/v1.LocalObjectReference"
      },
@@ -47706,6 +47713,22 @@
      }
     }
    },
+   "v1.ImageLabel": {
+    "description": "ImageLabel represents a label applied to the resulting image.",
+    "required": [
+     "name"
+    ],
+    "properties": {
+     "name": {
+      "description": "name defines the name of the label. It must have non-zero length.",
+      "type": "string"
+     },
+     "value": {
+      "description": "value defines the literal value of the label.",
+      "type": "string"
+     }
+    }
+   },
    "v1.ImageLayer": {
     "description": "ImageLayer represents a single layer of the image. Some images may have multiple layers. Some may have none.",
     "required": [

diff --git a/pkg/build/admission/defaults/api/v1/swagger_doc.go b/pkg/build/admission/defaults/api/v1/swagger_doc.go
@@ -12,6 +12,7 @@ var map_BuildDefaultsConfig = map[string]string{
 	"gitNoProxy":    "GitNoProxy is the list of domains for which the proxy should not be used",
 	"env":           "Env is a set of default environment variables that will be applied to the build if the specified variables do not exist on the build",
 	"sourceStrategyDefaults": "SourceStrategyDefaults are default values that apply to builds using the source strategy.",
+	"imageLabels":            "ImageLabels is a list of docker labels that are applied to the resulting image. User can override a default label by providing a label with the same name in their Build/BuildConfig.",
 }
 
 func (BuildDefaultsConfig) SwaggerDoc() map[string]string {

diff --git a/pkg/build/admission/overrides/api/v1/swagger_doc.go b/pkg/build/admission/overrides/api/v1/swagger_doc.go
@@ -6,8 +6,9 @@ package v1
 // ==== DO NOT EDIT THIS FILE MANUALLY ====
 
 var map_BuildOverridesConfig = map[string]string{
-	"":          "BuildOverridesConfig controls override settings for builds",
-	"forcePull": "ForcePull indicates whether the build strategy should always be set to ForcePull=true",
+	"":            "BuildOverridesConfig controls override settings for builds",
+	"forcePull":   "ForcePull indicates whether the build strategy should always be set to ForcePull=true",
+	"imageLabels": "ImageLabels is a list of docker labels that are applied to the resulting image. If user provided a label in their Build/BuildConfig with the same name as one in this list, the user's label will be overwritten.",
 }
 
 func (BuildOverridesConfig) SwaggerDoc() map[string]string {