Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ metadata:
name: kn-plugin-func-func-util-117
spec:
componentName: kn-plugin-func-func-util-117
application: serverless-operator-137

application: serverless-operator-137
source:
git:
url: https://github.com/openshift-knative/kn-plugin-func.git
Expand Down
106 changes: 58 additions & 48 deletions .tekton/docker-build.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apiVersion: tekton.dev/v1
kind: Pipeline
metadata:
creationTimestamp:
labels:
pipelines.openshift.io/runtime: generic
pipelines.openshift.io/strategy: docker
Expand All @@ -19,7 +18,8 @@ spec:
- linux/arm64
- linux/ppc64le
- linux/s390x
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
description: List of platforms to build the container images on. The available
set of values is determined by the configuration of the multi-platform-controller.
name: build-platforms
type: array
- default: --all-projects --org=3e1a4cca-ebfb-495f-b64c-3cc960d566b4 --exclude=test*,vendor,third_party
Expand All @@ -31,7 +31,8 @@ spec:
name: build-source-image
type: string
- default: "false"
description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
description: 'Enable in-development package managers. WARNING: the behavior may
change at any time without notice. Use at your own risk.'
name: prefetch-input-dev-package-managers
- default: []
description: Additional image tags
Expand All @@ -48,17 +49,15 @@ spec:
name: output-image
type: string
- default: .
description: Path to the source code of an application's component from where to build image.
description: Path to the source code of an application's component from where
to build image.
name: path-context
type: string
- default: Dockerfile
description: Path to the Dockerfile inside the context specified by parameter path-context
description: Path to the Dockerfile inside the context specified by parameter
path-context
name: dockerfile
type: string
- default: "false"
description: Force rebuild image
name: rebuild
type: string
- default: "false"
description: Skip checks against built image
name: skip-checks
Expand All @@ -72,17 +71,30 @@ spec:
name: prefetch-input
type: string
- default: ""
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
description: Image tag expiration time, time values could be something like 1h,
2d, 3w for hours, days, and weeks, respectively.
name: image-expires-after
type: string
- default: "true"
description: Add built image into an OCI image index
name: build-image-index
type: string
- default: docker
description: The format for the resulting image's mediaType. Valid values are oci or docker.
description: The format for the resulting image's mediaType. Valid values are
oci or docker.
name: buildah-format
type: string
- default: "false"
description: Enable cache proxy configuration
name: enable-cache-proxy
- default: "true"
description: Use the package registry proxy when prefetching dependencies
name: enable-package-registry-proxy
- default: .
description: Target directories in component's source code to scan with SAST tools.
Multiple values should be separated with commas.
name: sast-target-dirs
type: string
- default: []
description: Array of --build-arg values ("arg=value" strings) for buildah
name: build-args
Expand All @@ -92,12 +104,25 @@ spec:
name: build-args-file
type: string
- default: "false"
description: Whether to enable privileged mode, should be used only with remote VMs
description: Whether to enable privileged mode, should be used only with remote
VMs
name: privileged-nested
type: string
- name: enable-cache-proxy
default: 'false'
description: Enable cache proxy configuration
- default: ""
description: Sets the image created time and the SOURCE_DATE_EPOCH build argument.
On its own, it does not change file timestamps inside the layers (set rewrite-timestamp
to "true" for that). Leave empty to keep the actual build time.
name: source-date-epoch
type: string
- default: "false"
description: When "true", clamp file modification times in the image layers to
at most source-date-epoch. Does nothing unless source-date-epoch is set.
name: rewrite-timestamp
type: string
- default: "false"
description: When "true", omit the build history (history timestamps, layer metadata,
etc.) from the resulting image.
name: omit-history
type: string
results:
- description: ""
Expand All @@ -121,6 +146,8 @@ spec:
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
- name: image-url
value: $(tasks.build-image-index.results.IMAGE_URL)
- name: TARGET_DIRS
value: $(params.sast-target-dirs)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
- name: CACHI2_ARTIFACT
Expand All @@ -147,6 +174,8 @@ spec:
value: $(params.prefetch-input-dev-package-managers)
- name: input
value: $(params.prefetch-input)
- name: enable-package-registry-proxy
value: $(params.enable-package-registry-proxy)
- name: SOURCE_ARTIFACT
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
- name: ociStorage
Expand Down Expand Up @@ -190,12 +219,6 @@ spec:
resolver: bundles
- name: init
params:
- name: image-url
value: $(params.output-image)
- name: rebuild
value: $(params.rebuild)
- name: skip-checks
value: $(params.skip-checks)
- name: enable-cache-proxy
value: $(params.enable-cache-proxy)
taskRef:
Expand Down Expand Up @@ -228,11 +251,6 @@ spec:
- name: kind
value: task
resolver: bundles
when:
- input: $(tasks.init.results.build)
operator: in
values:
- "true"
workspaces:
- name: basic-auth
workspace: git-auth
Expand Down Expand Up @@ -268,16 +286,22 @@ spec:
value: $(tasks.clone-repository.results.url)
- name: BUILDAH_FORMAT
value: $(params.buildah-format)
- name: HTTP_PROXY
value: $(tasks.init.results.http-proxy)
- name: NO_PROXY
value: $(tasks.init.results.no-proxy)
- name: SOURCE_DATE_EPOCH
value: $(params.source-date-epoch)
- name: REWRITE_TIMESTAMP
value: $(params.rewrite-timestamp)
- name: OMIT_HISTORY
value: $(params.omit-history)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
- name: CACHI2_ARTIFACT
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: IMAGE_APPEND_PLATFORM
value: "true"
- name: HTTP_PROXY
value: $(tasks.init.results.http-proxy)
- name: NO_PROXY
value: $(tasks.init.results.no-proxy)
runAfter:
- prefetch-dependencies
taskRef:
Expand All @@ -289,19 +313,10 @@ spec:
- name: kind
value: task
resolver: bundles
when:
- input: $(tasks.init.results.build)
operator: in
values:
- "true"
- name: build-image-index
params:
- name: IMAGE
value: $(params.output-image)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
- name: ALWAYS_BUILD_INDEX
value: $(params.build-image-index)
- name: IMAGES
Expand All @@ -320,11 +335,6 @@ spec:
- name: kind
value: task
resolver: bundles
when:
- input: $(tasks.init.results.build)
operator: in
values:
- "true"
- name: build-source-image
params:
- name: BINARY_IMAGE
Expand All @@ -347,10 +357,6 @@ spec:
value: task
resolver: bundles
when:
- input: $(tasks.init.results.build)
operator: in
values:
- "true"
- input: $(params.build-source-image)
operator: in
values:
Expand Down Expand Up @@ -462,6 +468,8 @@ spec:
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
- name: image-url
value: $(tasks.build-image-index.results.IMAGE_URL)
- name: TARGET_DIRS
value: $(params.sast-target-dirs)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
- name: CACHI2_ARTIFACT
Expand All @@ -488,6 +496,8 @@ spec:
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
- name: image-url
value: $(tasks.build-image-index.results.IMAGE_URL)
- name: TARGET_DIRS
value: $(params.sast-target-dirs)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
- name: CACHI2_ARTIFACT
Expand Down
4 changes: 2 additions & 2 deletions .tekton/kn-plugin-func-func-util-117-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ spec:
- name: build-args
value:
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
- VERSION=1.37.1
- VERSION=1.37.2
- name: git-url
value: '{{source_url}}'
- name: hermetic
Expand Down
6 changes: 3 additions & 3 deletions .tekton/kn-plugin-func-func-util-117-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ spec:
- name: build-args
value:
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
- VERSION=1.37.1
- VERSION=1.37.2
- name: git-url
value: '{{source_url}}'
- name: hermetic
Expand All @@ -39,7 +39,7 @@ spec:
- name: additional-tags
value:
- $(context.pipelineRun.uid)-{{revision}}
- 1.37.1
- 1.37.2
- latest
- name: prefetch-input
value: '[{"type":"rpm"},{"path":".","type":"gomod"}]'
Expand Down
2 changes: 1 addition & 1 deletion openshift/ci-operator/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.23-openshift-4.19 as builder
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21 as builder

ARG TARGETARCH

Expand Down
2 changes: 1 addition & 1 deletion openshift/ci-operator/knative-images/func-util/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT! Generated Dockerfile for cmd/func-util.
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
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
Expand Down
Loading
Loading