Add dockerfile patch to latest images (#527)

* Add dockerfile patch to latest images

* Fix label

* Test ga registry

Author: dsimansk

openshift/ci-operator/knative-images/cli-artifacts/Dockerfile

@@ -1,8 +1,12 @@
 # This is not generated Dockerfile, yet!
-ARG CLI_ARTIFACTS=quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-client-cli-artifacts:latest
+ARG CLI_ARTIFACTS=registry.redhat.io/openshift-serverless-1/kn-cli-artifacts-rhel8:1.14
 
 FROM $CLI_ARTIFACTS
 
+ARG VERSION=knative-v1.15
+
+COPY LICENSE /licenses/
+
 USER 65532
 
 LABEL \
@@ -12,5 +16,5 @@ LABEL \
       summary="Red Hat OpenShift Serverless 1 kn Client artifacts" \
       maintainer="[email protected]" \
       description="Red Hat OpenShift Serverless 1 kn Client artifacts" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 kn Client artifacts"
-
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 kn Client artifacts" \
+      io.openshift.tags="kn-client-cli-artifacts"

openshift/ci-operator/knative-images/kn/Dockerfile

@@ -1,8 +1,8 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/kn.
 ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
 ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
-ARG IMAGE_KN_PLUGIN_FUNC_UTIL=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8sha256:49087b51e8b97d30ff7db67e1983d4ee63665092009af20a2598d7410eb781fb
-ARG IMAGE_KN_PLUGIN_EVENT_SENDER=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:443162d16adcb0dbc5ddbff4de172b2e7e80cc17928e0d9bf0e723cb0e99ebaf
+ARG IMAGE_KN_PLUGIN_FUNC_UTIL=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:134a07b2ecd8bb485d7f20bf23e863f5cec5620134c4a26b65e31d23c3076175
+ARG IMAGE_KN_PLUGIN_EVENT_SENDER=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:e2ea8370284a4807712849a0ec8c786bbf7cb6cd78dc2309c14e87470df235e6
 
 FROM $GO_BUILDER as builder
 

openshift/patches/dockerfile.patch openshift/dockerfile.patchopenshift/patches/dockerfile.patch renamed to openshift/dockerfile.patch

@@ -1,13 +1,13 @@
 diff --git a/openshift/ci-operator/knative-images/kn/Dockerfile b/openshift/ci-operator/knative-images/kn/Dockerfile
-index 5c338be8a..2b8bdf1b5 100755
+index 5c338be8a..710d49182 100755
 --- a/openshift/ci-operator/knative-images/kn/Dockerfile
 +++ b/openshift/ci-operator/knative-images/kn/Dockerfile
 @@ -1,6 +1,8 @@
  # DO NOT EDIT! Generated Dockerfile for cmd/kn.
  ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
  ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
-+ARG IMAGE_KN_PLUGIN_FUNC_UTIL=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8sha256:49087b51e8b97d30ff7db67e1983d4ee63665092009af20a2598d7410eb781fb
-+ARG IMAGE_KN_PLUGIN_EVENT_SENDER=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:443162d16adcb0dbc5ddbff4de172b2e7e80cc17928e0d9bf0e723cb0e99ebaf
++ARG IMAGE_KN_PLUGIN_FUNC_UTIL=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:134a07b2ecd8bb485d7f20bf23e863f5cec5620134c4a26b65e31d23c3076175
++ARG IMAGE_KN_PLUGIN_EVENT_SENDER=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:e2ea8370284a4807712849a0ec8c786bbf7cb6cd78dc2309c14e87470df235e6
 
  FROM $GO_BUILDER as builder
 

openshift/generate.sh

@@ -23,4 +23,4 @@ install_generate_hack_tool || exit 1
   --app-file-fmt "/ko-app/%s" \
   --dockerfile-image-builder-fmt "registry.ci.openshift.org/openshift/release:rhel-8-release-golang-%s-openshift-4.17"
 
-git apply $repo_root_dir/openshift/patches/dockerfile.patch
+git apply $repo_root_dir/openshift/dockerfile.patch