Merge pull request #13210 from smarterclayton/deref

Merged by openshift-bot

api/swagger-spec/oapi-v1.json

@@ -28334,16 +28334,33 @@
     "id": "v1.ImageStreamSpec",
     "description": "ImageStreamSpec represents options for ImageStreams.",
     "properties": {
+     "lookupPolicy": {
+      "$ref": "v1.ImageLookupPolicy",
+      "description": "lookupPolicy controls how other resources reference images within this namespace."
+     },
      "dockerImageRepository": {
       "type": "string",
-      "description": "DockerImageRepository is optional, if specified this stream is backed by a Docker repository on this server"
+      "description": "dockerImageRepository is optional, if specified this stream is backed by a Docker repository on this server"
      },
      "tags": {
       "type": "array",
       "items": {
        "$ref": "v1.TagReference"
       },
-      "description": "Tags map arbitrary string values to specific image locators"
+      "description": "tags map arbitrary string values to specific image locators"
+     }
+    }
+   },
+   "v1.ImageLookupPolicy": {
+    "id": "v1.ImageLookupPolicy",
+    "description": "ImageLookupPolicy describes how an image stream can be used to override the image references used by pods, builds, and other resources in a namespace.",
+    "required": [
+     "local"
+    ],
+    "properties": {
+     "local": {
+      "type": "boolean",
+      "description": "local will change the docker short image references (like \"mysql\" or \"php:latest\") on objects in this namespace to the image ID whenever they match this image stream, instead of reaching out to a remote registry. The name will be fully qualified to an image ID if found. The tag's referencePolicy is taken into account on the replaced value. Only works within the current namespace."
      }
     }
    },
@@ -28695,6 +28712,7 @@
     "required": [
      "tag",
      "generation",
+     "lookupPolicy",
      "image"
     ],
     "properties": {
@@ -28712,23 +28730,27 @@
      },
      "tag": {
       "$ref": "v1.TagReference",
-      "description": "Tag is the spec tag associated with this image stream tag, and it may be null if only pushes have occurred to this image stream."
+      "description": "tag is the spec tag associated with this image stream tag, and it may be null if only pushes have occurred to this image stream."
      },
      "generation": {
       "type": "integer",
       "format": "int64",
-      "description": "Generation is the current generation of the tagged image - if tag is provided and this value is not equal to the tag generation, a user has requested an import that has not completed, or Conditions will be filled out indicating any error."
+      "description": "generation is the current generation of the tagged image - if tag is provided and this value is not equal to the tag generation, a user has requested an import that has not completed, or conditions will be filled out indicating any error."
+     },
+     "lookupPolicy": {
+      "$ref": "v1.ImageLookupPolicy",
+      "description": "lookupPolicy indicates whether this tag will handle image references in this namespace."
      },
      "conditions": {
       "type": "array",
       "items": {
        "$ref": "v1.TagEventCondition"
       },
-      "description": "Conditions is an array of conditions that apply to the image stream tag."
+      "description": "conditions is an array of conditions that apply to the image stream tag."
      },
      "image": {
       "$ref": "v1.Image",
-      "description": "Image associated with the ImageStream and tag."
+      "description": "image associated with the ImageStream and tag."
      }
     }
    },

api/swagger-spec/openshift-openapi-spec.json

@@ -76325,6 +76325,18 @@
      }
     }
    },
+   "v1.ImageLookupPolicy": {
+    "description": "ImageLookupPolicy describes how an image stream can be used to override the image references used by pods, builds, and other resources in a namespace.",
+    "required": [
+     "local"
+    ],
+    "properties": {
+     "local": {
+      "description": "local will change the docker short image references (like \"mysql\" or \"php:latest\") on objects in this namespace to the image ID whenever they match this image stream, instead of reaching out to a remote registry. The name will be fully qualified to an image ID if found. The tag's referencePolicy is taken into account on the replaced value. Only works within the current namespace.",
+      "type": "boolean"
+     }
+    }
+   },
    "v1.ImageSignature": {
     "description": "ImageSignature holds a signature of an image. It allows to verify image identity and possibly other claims as long as the signature is trusted. Based on this information it is possible to restrict runnable images to those matching cluster-wide policy. Mandatory fields should be parsed by clients doing image verification. The others are parsed from signature's content by the server. They serve just an informative purpose.",
     "required": [
@@ -76610,11 +76622,15 @@
     "description": "ImageStreamSpec represents options for ImageStreams.",
     "properties": {
      "dockerImageRepository": {
-      "description": "DockerImageRepository is optional, if specified this stream is backed by a Docker repository on this server",
+      "description": "dockerImageRepository is optional, if specified this stream is backed by a Docker repository on this server",
       "type": "string"
      },
+     "lookupPolicy": {
+      "description": "lookupPolicy controls how other resources reference images within this namespace.",
+      "$ref": "#/definitions/v1.ImageLookupPolicy"
+     },
      "tags": {
-      "description": "Tags map arbitrary string values to specific image locators",
+      "description": "tags map arbitrary string values to specific image locators",
       "type": "array",
       "items": {
        "$ref": "#/definitions/v1.TagReference"
@@ -76646,6 +76662,7 @@
     "required": [
      "tag",
      "generation",
+     "lookupPolicy",
      "image"
     ],
     "properties": {
@@ -76654,31 +76671,35 @@
       "type": "string"
      },
      "conditions": {
-      "description": "Conditions is an array of conditions that apply to the image stream tag.",
+      "description": "conditions is an array of conditions that apply to the image stream tag.",
       "type": "array",
       "items": {
        "$ref": "#/definitions/v1.TagEventCondition"
       }
      },
      "generation": {
-      "description": "Generation is the current generation of the tagged image - if tag is provided and this value is not equal to the tag generation, a user has requested an import that has not completed, or Conditions will be filled out indicating any error.",
+      "description": "generation is the current generation of the tagged image - if tag is provided and this value is not equal to the tag generation, a user has requested an import that has not completed, or conditions will be filled out indicating any error.",
       "type": "integer",
       "format": "int64"
      },
      "image": {
-      "description": "Image associated with the ImageStream and tag.",
+      "description": "image associated with the ImageStream and tag.",
       "$ref": "#/definitions/v1.Image"
      },
      "kind": {
       "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds",
       "type": "string"
      },
+     "lookupPolicy": {
+      "description": "lookupPolicy indicates whether this tag will handle image references in this namespace.",
+      "$ref": "#/definitions/v1.ImageLookupPolicy"
+     },
      "metadata": {
       "description": "Standard object's metadata.",
       "$ref": "#/definitions/v1.ObjectMeta"
      },
      "tag": {
-      "description": "Tag is the spec tag associated with this image stream tag, and it may be null if only pushes have occurred to this image stream.",
+      "description": "tag is the spec tag associated with this image stream tag, and it may be null if only pushes have occurred to this image stream.",
       "$ref": "#/definitions/v1.TagReference"
      }
     }

contrib/completions/bash/oc

@@ -7868,6 +7868,8 @@ _oc_create_imagestream()
     local_nonpersistent_flags+=("--allow-missing-template-keys")
     flags+=("--dry-run")
     local_nonpersistent_flags+=("--dry-run")
+    flags+=("--lookup-local")
+    local_nonpersistent_flags+=("--lookup-local")
     flags+=("--no-headers")
     local_nonpersistent_flags+=("--no-headers")
     flags+=("--output=")
@@ -11469,6 +11471,8 @@ _oc_import-image()
     local_nonpersistent_flags+=("--all")
     flags+=("--confirm")
     local_nonpersistent_flags+=("--confirm")
+    flags+=("--dry-run")
+    local_nonpersistent_flags+=("--dry-run")
     flags+=("--from=")
     local_nonpersistent_flags+=("--from=")
     flags+=("--insecure")
@@ -15723,6 +15727,89 @@ _oc_set_image()
     noun_aliases=()
 }
 
+_oc_set_image-lookup()
+{
+    last_command="oc_set_image-lookup"
+    commands=()
+
+    flags=()
+    two_word_flags=()
+    local_nonpersistent_flags=()
+    flags_with_completion=()
+    flags_completion=()
+
+    flags+=("--all")
+    local_nonpersistent_flags+=("--all")
+    flags+=("--allow-missing-template-keys")
+    local_nonpersistent_flags+=("--allow-missing-template-keys")
+    flags+=("--dry-run")
+    local_nonpersistent_flags+=("--dry-run")
+    flags+=("--enabled")
+    local_nonpersistent_flags+=("--enabled")
+    flags+=("--filename=")
+    flags_with_completion+=("--filename")
+    flags_completion+=("__handle_filename_extension_flag yaml|yml|json")
+    two_word_flags+=("-f")
+    flags_with_completion+=("-f")
+    flags_completion+=("__handle_filename_extension_flag yaml|yml|json")
+    local_nonpersistent_flags+=("--filename=")
+    flags+=("--local")
+    local_nonpersistent_flags+=("--local")
+    flags+=("--no-headers")
+    local_nonpersistent_flags+=("--no-headers")
+    flags+=("--output=")
+    two_word_flags+=("-o")
+    local_nonpersistent_flags+=("--output=")
+    flags+=("--selector=")
+    two_word_flags+=("-l")
+    local_nonpersistent_flags+=("--selector=")
+    flags+=("--show-all")
+    flags+=("-a")
+    local_nonpersistent_flags+=("--show-all")
+    flags+=("--show-labels")
+    local_nonpersistent_flags+=("--show-labels")
+    flags+=("--sort-by=")
+    local_nonpersistent_flags+=("--sort-by=")
+    flags+=("--template=")
+    flags_with_completion+=("--template")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--template=")
+    flags+=("--as=")
+    flags+=("--certificate-authority=")
+    flags_with_completion+=("--certificate-authority")
+    flags_completion+=("_filedir")
+    flags+=("--client-certificate=")
+    flags_with_completion+=("--client-certificate")
+    flags_completion+=("_filedir")
+    flags+=("--client-key=")
+    flags_with_completion+=("--client-key")
+    flags_completion+=("_filedir")
+    flags+=("--cluster=")
+    flags+=("--config=")
+    flags_with_completion+=("--config")
+    flags_completion+=("_filedir")
+    flags+=("--context=")
+    flags+=("--insecure-skip-tls-verify")
+    flags+=("--log-flush-frequency=")
+    flags+=("--loglevel=")
+    flags+=("--logspec=")
+    flags+=("--match-server-version")
+    flags+=("--namespace=")
+    flags_with_completion+=("--namespace")
+    flags_completion+=("__oc_get_namespaces")
+    two_word_flags+=("-n")
+    flags_with_completion+=("-n")
+    flags_completion+=("__oc_get_namespaces")
+    flags+=("--request-timeout=")
+    flags+=("--server=")
+    flags+=("--token=")
+    flags+=("--user=")
+
+    must_have_one_flag=()
+    must_have_one_noun=()
+    noun_aliases=()
+}
+
 _oc_set_probe()
 {
     last_command="oc_set_probe"
@@ -16240,6 +16327,7 @@ _oc_set()
     commands+=("deployment-hook")
     commands+=("env")
     commands+=("image")
+    commands+=("image-lookup")
     commands+=("probe")
     commands+=("resources")
     commands+=("route-backends")