Skip to content

Commit 238f3ff

Browse files
authored
Merge pull request #281 from CrystalChun/konflux-2.12-1
[release-ocm-2.12] NO-ISSUE: Add Konflux files for ACM 2.12/MCE 2.7 builds
2 parents e7f926d + ec96898 commit 238f3ff

File tree

3 files changed

+124
-5
lines changed

3 files changed

+124
-5
lines changed
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
apiVersion: tekton.dev/v1
2+
kind: PipelineRun
3+
metadata:
4+
annotations:
5+
build.appstudio.openshift.io/repo: https://github.com/openshift/cluster-api-provider-agent?rev={{revision}}
6+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
7+
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
8+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
9+
pipelinesascode.tekton.dev/cancel-in-progress: "true"
10+
pipelinesascode.tekton.dev/max-keep-runs: "3"
11+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
12+
== "release-ocm-2.12"
13+
creationTimestamp: null
14+
labels:
15+
appstudio.openshift.io/application: release-mce-27
16+
appstudio.openshift.io/component: cluster-api-provider-agent-mce-27
17+
pipelines.appstudio.openshift.io/type: build
18+
name: cluster-api-provider-agent-mce-27-on-pull-request
19+
namespace: crt-redhat-acm-tenant
20+
spec:
21+
params:
22+
- name: git-url
23+
value: '{{source_url}}'
24+
- name: revision
25+
value: '{{revision}}'
26+
- name: output-image
27+
value: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/cluster-api-provider-agent-mce-27:on-pr-{{revision}}
28+
- name: image-expires-after
29+
value: 5d
30+
- name: build-platforms
31+
value:
32+
- linux/x86_64
33+
- name: dockerfile
34+
value: Dockerfile.rhtap
35+
- name: hermetic
36+
value: "true"
37+
- name: build-source-image
38+
value: 'true'
39+
- name: path-context
40+
value: .
41+
pipelineRef:
42+
resolver: git
43+
params:
44+
- name: url
45+
value: "https://github.com/stolostron/konflux-build-catalog.git"
46+
- name: revision
47+
value: main
48+
- name: pathInRepo
49+
value: pipelines/common_mce_2.7.yaml
50+
taskRunTemplate:
51+
serviceAccountName: build-pipeline-cluster-api-provider-agent-mce-27
52+
workspaces:
53+
- name: git-auth
54+
secret:
55+
secretName: '{{ git_auth_secret }}'
56+
status: {}
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
apiVersion: tekton.dev/v1
2+
kind: PipelineRun
3+
metadata:
4+
annotations:
5+
build.appstudio.openshift.io/repo: https://github.com/openshift/cluster-api-provider-agent?rev={{revision}}
6+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
7+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
8+
pipelinesascode.tekton.dev/cancel-in-progress: "false"
9+
pipelinesascode.tekton.dev/max-keep-runs: "3"
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
11+
== "release-ocm-2.12"
12+
creationTimestamp: null
13+
labels:
14+
appstudio.openshift.io/application: release-mce-27
15+
appstudio.openshift.io/component: cluster-api-provider-agent-mce-27
16+
pipelines.appstudio.openshift.io/type: build
17+
name: cluster-api-provider-agent-mce-27-on-push
18+
namespace: crt-redhat-acm-tenant
19+
spec:
20+
params:
21+
- name: git-url
22+
value: '{{source_url}}'
23+
- name: revision
24+
value: '{{revision}}'
25+
- name: output-image
26+
value: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/cluster-api-provider-agent-mce-27:{{revision}}
27+
- name: build-platforms
28+
value:
29+
- linux/x86_64
30+
- linux/ppc64le
31+
- linux/s390x
32+
- linux/arm64
33+
- name: dockerfile
34+
value: Dockerfile.rhtap
35+
- name: hermetic
36+
value: "true"
37+
- name: build-source-image
38+
value: 'true'
39+
- name: path-context
40+
value: .
41+
pipelineRef:
42+
resolver: git
43+
params:
44+
- name: url
45+
value: "https://github.com/stolostron/konflux-build-catalog.git"
46+
- name: revision
47+
value: main
48+
- name: pathInRepo
49+
value: pipelines/common_mce_2.7.yaml
50+
taskRunTemplate:
51+
serviceAccountName: build-pipeline-cluster-api-provider-agent-mce-27
52+
workspaces:
53+
- name: git-auth
54+
secret:
55+
secretName: '{{ git_auth_secret }}'
56+
status: {}

Dockerfile.rhtap

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
# Build the manager binary
2-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.21 as builder
2+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 as builder
33

44
WORKDIR /workspace
55
COPY . .
66
# Build
7-
RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -a -o manager main.go
7+
RUN CGO_ENABLED=1 go build -a -o manager main.go
88

99
FROM registry.redhat.io/rhel9-2-els/rhel:9.2
10+
LABEL \
11+
name="cluster-api-provider-agent" \
12+
com.redhat.component="cluster-api-provider-agent" \
13+
description="Kubernetes-native declarative infrastructure for agent-based installation. \
14+
cluster-api-provider-agent serves as infrastructure provider for Kubernetes cluster-api." \
15+
io.k8s.description="Kubernetes-native declarative infrastructure for agent-based installation. \
16+
cluster-api-provider-agent serves as infrastructure provider for Kubernetes cluster-api." \
17+
summary="Kubernetes-native declarative infrastructure for agent-based installation." \
18+
io.k8s.display-name="cluster-api-provider-agent" \
19+
io.openshift.tags="mce hypershift cluster-api-provider-agent"
1020
WORKDIR /
1121
COPY --from=builder /workspace/manager .
1222
USER 65532:65532
1323

1424
ENTRYPOINT ["/manager"]
15-
16-
ARG QUAY_TAG_EXPIRATION
17-
LABEL "quay.expires-after"=${QUAY_TAG_EXPIRATION}

0 commit comments

Comments
 (0)