[release-v1.21] Align image dockerfiles

Dockerfile

@@ -0,0 +1,40 @@
+# DO NOT EDIT! Generated Dockerfile for cmd/kn.
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
+
+FROM $GO_BUILDER as builder
+
+WORKDIR /workspace
+COPY . .
+
+ENV CGO_ENABLED=1
+ENV GOEXPERIMENT=strictfipsruntime
+
+ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel9@sha256:0204175383d951f1d2160756b5d85a72b21ad58def704833e84cfee57d93ebb1
+ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel9@sha256:720c9d42f5af97557f01be26f84515489f3cbe5c34c87fd40a123c1a7c2b627b
+RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/kn
+
+FROM $GO_RUNTIME
+
+ARG VERSION=knative-v1.21
+
+COPY --from=builder /usr/bin/main /ko-app/kn
+COPY LICENSE /licenses/
+
+USER 65532
+
+LABEL \
+      com.redhat.component="openshift-serverless-1-kn-client-kn-rhel9-container" \
+      name="openshift-serverless-1/kn-client-kn-rhel9" \
+      version=$VERSION \
+      summary="Red Hat OpenShift Serverless 1 Client Kn" \
+      maintainer="serverless-support@redhat.com" \
+      description="Red Hat OpenShift Serverless 1 Client Kn" \
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Kn" \
+      io.k8s.description="Red Hat OpenShift Serverless Client Kn" \
+      io.openshift.tags="kn" \
+      vendor="Red Hat, Inc." \
+      release=$VERSION \
+      cpe="cpe:/a:redhat:openshift_serverless:1.38::el9"
+
+ENTRYPOINT ["/ko-app/kn"]

hack/build.sh

@@ -167,10 +167,10 @@ go_build_with_goos_goarch() {
   echo "🚧 Compile for GOOS=${GOOS} GOARCH=${GOARCH}"
 
   # Env var exported by hack/build-flags.sh
-  GOOS="${GOOS}" GOARCH="${GOARCH}" go build -ldflags "${KN_BUILD_LD_FLAGS:-}" -o kn ./cmd/...
+  GOOS="${GOOS}" GOARCH="${GOARCH}" go build -ldflags "${KN_BUILD_LD_FLAGS:-}" -o "kn-${GOOS}-${GOARCH}" ./cmd/...
 
-  if $(file kn | grep -q -i "Windows"); then
-    mv kn kn.exe
+  if $(file "kn-${GOOS}-${GOARCH}" | grep -q -i "Windows"); then
+    mv "kn-${GOOS}-${GOARCH}" "kn-${GOOS}-${GOARCH}.exe"
   fi
 }
 

openshift/ci-operator/build-image/Dockerfile

@@ -3,7 +3,7 @@
 FROM registry.ci.openshift.org/ocp/4.19:cli-artifacts as tools
 
 # Dockerfile to bootstrap build and test in openshift-ci
-FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.20 as builder
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21 as builder
 
 ARG TARGETARCH
 

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

@@ -8,8 +8,8 @@ WORKDIR /workspace
 # Allow copying from higher directory when context is limited
 COPY . .
 ENV TAG="v1.21.0"
-ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel9@sha256:7213f40b00c34011a2abfe834d52902305f86d8c76be0143d8d9ac9ba1300c59
-ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel9@sha256:51844c9f14680b29b072e2b26bba0f5cc2fb9206adc207a2e1d3e5330d512f6d
+ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel9@sha256:0204175383d951f1d2160756b5d85a72b21ad58def704833e84cfee57d93ebb1
+ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel9@sha256:720c9d42f5af97557f01be26f84515489f3cbe5c34c87fd40a123c1a7c2b627b
 # Build binaries
 # RUN make build-cross-package
 RUN ./hack/build.sh -p linux amd64

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

@@ -1,5 +1,5 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/kn.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.20
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21
 ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
@@ -9,10 +9,9 @@ COPY . .
 
 ENV CGO_ENABLED=1
 ENV GOEXPERIMENT=strictfipsruntime
-ENV GOFLAGS='-mod=mod'
 
-ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel9@sha256:7213f40b00c34011a2abfe834d52902305f86d8c76be0143d8d9ac9ba1300c59
-ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel9@sha256:51844c9f14680b29b072e2b26bba0f5cc2fb9206adc207a2e1d3e5330d512f6d
+ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel9@sha256:0204175383d951f1d2160756b5d85a72b21ad58def704833e84cfee57d93ebb1
+ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel9@sha256:720c9d42f5af97557f01be26f84515489f3cbe5c34c87fd40a123c1a7c2b627b
 RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/kn
 
 FROM $GO_RUNTIME

openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile

@@ -1,5 +1,5 @@
 # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/serving/test/test_images/grpc-ping.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.20
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21
 ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder

openshift/ci-operator/knative-test-images/helloworld/Dockerfile

@@ -1,5 +1,5 @@
 # DO NOT EDIT! Generated Dockerfile for test/test_images/helloworld.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.20
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21
 ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
@@ -9,7 +9,6 @@ COPY . .
 
 ENV CGO_ENABLED=1
 ENV GOEXPERIMENT=strictfipsruntime
-ENV GOFLAGS='-mod=mod'
 
 RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/helloworld
 

openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile

@@ -1,5 +1,5 @@
 # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/serving/test/test_images/multicontainer/servingcontainer.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.20
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21
 ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder

openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile

@@ -1,5 +1,5 @@
 # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/serving/test/test_images/multicontainer/sidecarcontainer.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.20
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21
 ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder

openshift/generate.sh

@@ -25,12 +25,12 @@ install_generate_hack_tool || exit 1
   --excludes ".*knative.dev/hack/cmd/script.*" \
   --app-file-fmt "/ko-app/%s" \
   --generate-rpms-lock-file \
-  --dockerfile-image-builder-fmt "registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.20"
+  --dockerfile-image-builder-fmt "registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21"
 
 
 #git apply $repo_root_dir/openshift/dockerfile.patch
-FUNC_UTIL=$(skopeo inspect -n --format '{{.Digest}}' docker://quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/kn-plugin-func-func-util:1.37.1 --override-os linux --override-arch amd64)
-EVENT_SENDER=$(skopeo inspect -n --format '{{.Digest}}' docker://quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/kn-plugin-event-sender:1.37.1 --override-os linux --override-arch amd64)
+FUNC_UTIL=$(skopeo inspect -n --format '{{.Digest}}' docker://quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-138/kn-plugin-func-func-util:latest --override-os linux --override-arch amd64)
+EVENT_SENDER=$(skopeo inspect -n --format '{{.Digest}}' docker://quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-138/kn-plugin-event-sender:latest --override-os linux --override-arch amd64)
 
 echo "func-util sha: ${FUNC_UTIL}"
 echo "event-sender sha: ${EVENT_SENDER}"

openshift/images.yaml

@@ -1,2 +1,5 @@
 knative.dev/client/cmd/kn: registry.ci.openshift.org/openshift/knative-client-kn:knative-v1.21
 knative.dev/client/test/test_images/helloworld: registry.ci.openshift.org/openshift/knative-client-test-helloworld:knative-v1.21
+knative.dev/serving/test/test_images/grpc-ping: registry.ci.openshift.org/openshift/knative-client-test-grpc-ping:knative-v1.21
+knative.dev/serving/test/test_images/multicontainer/servingcontainer: registry.ci.openshift.org/openshift/knative-client-test-servingcontainer:knative-v1.21
+knative.dev/serving/test/test_images/multicontainer/sidecarcontainer: registry.ci.openshift.org/openshift/knative-client-test-sidecarcontainer:knative-v1.21

rpms.in.yaml

@@ -0,0 +1,24 @@
+contentOrigin:
+  # Define at least one source of packages, but you can have as many as you want.
+  repofiles:
+    # Either local path or url pointing to .repo file
+    - 'https://raw.githubusercontent.com/konflux-ci/bazel-builder/refs/heads/bazel8-ubi9/ubi9.repo'
+packages:
+  # list of rpm names to resolve
+  - tar
+  - zip
+
+arches:
+  # The list of architectures can be set in the config file. Any `--arch` option set
+  # on the command line will override this list.
+  - x86_64
+  - aarch64
+  - s390x
+  - ppc64le
+
+context:
+  # Alternative to setting command line options. Usually you will only want
+  # to include one of these options, with the exception of `flatpak` that
+  # can be combined with `image` and `containerfile`
+  # containerfile: ubi9.Containerfile
+  image: registry.access.redhat.com/ubi9/ubi-minimal

vendor/emperror.dev/errors/.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.go]
+indent_style = tab

vendor/emperror.dev/errors/.fossa.yml

@@ -0,0 +1,14 @@
+version: 2
+cli:
+    server: https://app.fossa.com
+    fetcher: custom
+    project: emperror.dev/errors
+analyze:
+    modules:
+        -   name: emperror.dev/errors
+            type: go
+            target: emperror.dev/errors
+            strategy: gomodules
+            path: .
+            options:
+                allow-unresolved: true

vendor/emperror.dev/errors/.gitignore

@@ -0,0 +1,6 @@
+/tmp/
+/vendor/
+
+# Please output directory and local configuration
+plz-out
+.plzconfig.local

vendor/emperror.dev/errors/.golangci.yml

@@ -0,0 +1,86 @@
+run:
+    skip-dirs:
+        - tests
+    skip-files:
+        - format_test.go
+        - wrap_go1_12.go
+        - wrap_go1_12_test.go
+        - wrap_test.go
+
+linters-settings:
+    gci:
+        local-prefixes: emperror.dev/errors
+    goimports:
+        local-prefixes: emperror.dev/errors
+    golint:
+        min-confidence: 0
+
+linters:
+    disable-all: true
+    enable:
+        - bodyclose
+        - deadcode
+        - dogsled
+        - dupl
+        - errcheck
+        - exhaustive
+        - exportloopref
+        - gci
+        - gochecknoglobals
+        - gochecknoinits
+        - gocognit
+        - goconst
+        - gocritic
+        - gocyclo
+        - godot
+        - gofmt
+        - gofumpt
+        - goimports
+        - golint
+        - goprintffuncname
+        - gosec
+        - gosimple
+        - govet
+        - ineffassign
+        - lll
+        - misspell
+        - nakedret
+        - nlreturn
+        - noctx
+        - nolintlint
+        - prealloc
+        - rowserrcheck
+        - scopelint
+        - sqlclosecheck
+        - staticcheck
+        - structcheck
+        - stylecheck
+        - typecheck
+        - unconvert
+        - unparam
+        - unused
+        - varcheck
+        - whitespace
+
+        # unused
+        # - depguard
+        # - goheader
+        # - gomodguard
+
+        # don't enable:
+        # - asciicheck
+        # - funlen
+        # - godox
+        # - goerr113
+        # - gomnd
+        # - interfacer
+        # - maligned
+        # - nestif
+        # - testpackage
+        # - wsl
+
+issues:
+    exclude-rules:
+        -   text: "package comment should not have leading space"
+            linters:
+                - golint

vendor/emperror.dev/errors/.plzconfig

@@ -0,0 +1,21 @@
+[please]
+version = 15.5.0
+
+[go]
+importpath = emperror.dev/errors
+
+[buildconfig]
+golangci-lint-version = 1.31.0
+gotestsum-version = 0.5.3
+
+[alias "lint"]
+desc = Runs linters for this repo
+cmd = run ///pleasings2//tools/go:golangci-lint -- run
+
+[alias "gotest"]
+desc = Runs tests for this repo
+cmd = run ///pleasings2//tools/go:gotestsum -- --no-summary=skipped --format short -- -race -covermode=atomic -coverprofile=plz-out/log/coverage.txt ./...
+
+[alias "release"]
+desc = Release a new version
+cmd = run ///pleasings2//tools/misc:releaser --