Merge pull request #17091 from bparees/tag_merging

Automatic merge from submit-queue (batch tested with PRs 17149, 17091).

merge imagestreamtag list on patch

This will ensure we don't drop spec tags when applying a new set of imagestreams that is not a superset of the existing spec tags.

related to https://bugzilla.redhat.com/show_bug.cgi?id=1507031

Author: openshift-merge-robot

api/protobuf-spec/github_com_openshift_origin_pkg_image_apis_image_v1.proto

@@ -90326,7 +90326,9 @@
       "type": "array",
       "items": {
        "$ref": "#/definitions/com.github.openshift.origin.pkg.image.apis.image.v1.TagReference"
-      }
+      },
+      "x-kubernetes-patch-merge-key": "name",
+      "x-kubernetes-patch-strategy": "merge"
      }
     }
    },
@@ -90349,7 +90351,9 @@
       "type": "array",
       "items": {
        "$ref": "#/definitions/com.github.openshift.origin.pkg.image.apis.image.v1.NamedTagEventList"
-      }
+      },
+      "x-kubernetes-patch-merge-key": "tag",
+      "x-kubernetes-patch-strategy": "merge"
      }
     }
    },

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

@@ -184,7 +184,9 @@ type ImageStreamSpec struct {
 	// Specify the source for the tags to be imported in each tag via the spec.tags.from reference instead.
 	DockerImageRepository string `json:"dockerImageRepository,omitempty" protobuf:"bytes,1,opt,name=dockerImageRepository"`
 	// tags map arbitrary string values to specific image locators
-	Tags []TagReference `json:"tags,omitempty" protobuf:"bytes,2,rep,name=tags"`
+	// +patchMergeKey=name
+	// +patchStrategy=merge
+	Tags []TagReference `json:"tags,omitempty" patchStrategy:"merge" patchMergeKey:"name" protobuf:"bytes,2,rep,name=tags"`
 }
 
 // ImageLookupPolicy describes how an image stream can be used to override the image references
@@ -274,7 +276,9 @@ type ImageStreamStatus struct {
 	PublicDockerImageRepository string `json:"publicDockerImageRepository,omitempty" protobuf:"bytes,3,opt,name=publicDockerImageRepository"`
 	// Tags are a historical record of images associated with each tag. The first entry in the
 	// TagEvent array is the currently tagged image.
-	Tags []NamedTagEventList `json:"tags,omitempty" protobuf:"bytes,2,rep,name=tags"`
+	// +patchMergeKey=tag
+	// +patchStrategy=merge
+	Tags []NamedTagEventList `json:"tags,omitempty" patchStrategy:"merge" patchMergeKey:"tag" protobuf:"bytes,2,rep,name=tags"`
 }
 
 // NamedTagEventList relates a tag to its image history.

pkg/image/apis/image/v1/generated.proto

@@ -6135,6 +6135,12 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
 							},
 						},
 						"tags": {
+							VendorExtensible: spec.VendorExtensible{
+								Extensions: spec.Extensions{
+									"x-kubernetes-patch-merge-key": "name",
+									"x-kubernetes-patch-strategy":  "merge",
+								},
+							},
 							SchemaProps: spec.SchemaProps{
 								Description: "tags map arbitrary string values to specific image locators",
 								Type:        []string{"array"},
@@ -6173,6 +6179,12 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
 							},
 						},
 						"tags": {
+							VendorExtensible: spec.VendorExtensible{
+								Extensions: spec.Extensions{
+									"x-kubernetes-patch-merge-key": "tag",
+									"x-kubernetes-patch-strategy":  "merge",
+								},
+							},
 							SchemaProps: spec.SchemaProps{
 								Description: "Tags are a historical record of images associated with each tag. The first entry in the TagEvent array is the currently tagged image.",
 								Type:        []string{"array"},

pkg/image/apis/image/v1/types.go

@@ -9,7 +9,7 @@ trap os::test::junit::reconcile_output EXIT
   os::cmd::expect_success 'oc login -u system:admin'
   cluster_admin_context="$( oc config current-context )"
   os::cmd::expect_success "oc config use-context '${original_context}'"
-  oc delete project test-cmd-images-2 --context=${cluster_admin_context}
+  oc delete project test-cmd-images-2 merge-tags --context=${cluster_admin_context}
   oc delete all,templates --all --context=${cluster_admin_context}
 
   exit 0
@@ -292,4 +292,15 @@ os::cmd::expect_success 'oc delete all --all'
 echo "delete istag: ok"
 os::test::junit::declare_suite_end
 
+os::test::junit::declare_suite_start "cmd/images${IMAGES_TESTS_POSTFIX:-}/merge-tags-on-apply"
+os::cmd::expect_success 'oc new-project merge-tags'
+os::cmd::expect_success 'oc create -f examples/image-streams/image-streams-centos7.json'
+os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[*].name}' '2.0 2.2 2.3 2.4 latest'
+os::cmd::expect_success 'oc apply -f test/testdata/images/modified-ruby-imagestream.json'
+os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[*].name}' '2.0 2.2 2.3 2.4 latest newtag'
+os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[3].annotations.version}' '2.4 patched'
+os::cmd::expect_success 'oc delete project merge-tags'
+echo "apply new imagestream tags: ok"
+os::test::junit::declare_suite_end
+
 os::test::junit::declare_suite_end

pkg/openapi/zz_generated.openapi.go

@@ -0,0 +1,38 @@
+{
+  "kind": "ImageStream",
+  "apiVersion": "v1",
+  "metadata": {
+    "name": "ruby",
+    "annotations": {
+      "openshift.io/display-name": "Ruby"
+    }
+  },
+  "spec": {
+    "tags": [
+      {
+        "name": "2.4",
+        "annotations": {
+          "openshift.io/display-name": "Ruby Patched",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and run Ruby 2.4 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/2.4/README.md.",
+          "iconClass": "icon-ruby",
+          "tags": "builder,ruby",
+          "supports": "ruby:2.4,ruby",
+          "version": "2.4 patched",
+          "sampleRepo": "https://github.com/openshift/ruby-ex.git"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "centos/ruby-24-centos7:latest"
+        }
+      },
+      {
+        "name": "newtag",
+        "from": {
+          "kind": "DockerImage",
+          "name": "centos/ruby-24-centos7:latest"
+        }
+      }
+    ]
+  }
+}