Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
1d444cf
Review Dockerfile and RPMs file for building odh-codeflare-operator i…
MohammadiIram Oct 8, 2024
98dae35
Review Dockerfile and RPMs file for building odh-codeflare-operator i…
MohammadiIram Oct 9, 2024
203219c
Review Dockerfile and RPMs file for building odh-codeflare-operator i…
MohammadiIram Oct 10, 2024
ddc68cf
Review Dockerfile and RPMs file for building odh-codeflare-operator i…
MohammadiIram Oct 15, 2024
8b1f5b5
Review Dockerfile and RPMs file for building odh-codeflare-operator i…
MohammadiIram Oct 15, 2024
0cd217a
Review Dockerfile and RPMs file for building odh-codeflare-operator i…
MohammadiIram Oct 15, 2024
607e669
Review Dockerfile and RPMs file for building odh-codeflare-operator i…
MohammadiIram Oct 16, 2024
f3cb839
Merge pull request #24 from red-hat-data-services/konflux-2.16
MohammadiIram Oct 16, 2024
ae20544
add renovate.json config
MohammadiIram Oct 16, 2024
d6b1270
Merge pull request #25 from red-hat-data-services/konflux-2.16
MohammadiIram Oct 16, 2024
9d7b418
Merge remote-tracking branch 'upstream/main'
ChristianZaccaria Oct 17, 2024
7013aba
Update renovate.json for 2.16
MohammadiIram Oct 22, 2024
2453df6
Merge pull request #30 from red-hat-data-services/update-renovate
MohammadiIram Oct 22, 2024
3002209
Update renovate.json
MohammadiIram Oct 22, 2024
e6c65f2
Update registry-proxy.engineering.redhat.com/rh-osbs/openshift-golang…
konflux-internal-p02[bot] Oct 22, 2024
aa210a4
Merge remote-tracking branch 'upstream/main'
dchourasia Nov 2, 2024
a2f82f8
update Dockerfile.konflux for adding required LABEL
MohammadiIram Oct 30, 2024
63437bf
Update renovate.json for tekton and dockerfile
MohammadiIram Nov 5, 2024
d0afc2d
Update Dockerfile.konflux
MohammadiIram Nov 5, 2024
73dd350
Merge pull request #35 from red-hat-data-services/MohammadiIram-patch-1
MohammadiIram Nov 5, 2024
0e720dc
Update registry.access.redhat.com/ubi8/ubi-minimal Docker digest to c…
konflux-internal-p02[bot] Nov 6, 2024
4d88f12
Update registry.redhat.io/ubi8/ubi Docker digest to 8990388
konflux-internal-p02[bot] Nov 6, 2024
5570b9c
Merge remote-tracking branch 'upstream/main'
dchourasia Nov 7, 2024
d97c459
Merge remote-tracking branch 'upstream/main'
ChristianZaccaria Nov 7, 2024
61c7968
Update Dockerfile.konflux with tag+digest
MohammadiIram Nov 8, 2024
3dfc101
Merge pull request #39 from red-hat-data-services/MohammadiIram-patch-2
MohammadiIram Nov 8, 2024
945c1a6
Update Golang builder image to use brew.registry.redhat.io
MohammadiIram Nov 8, 2024
03ce71c
Merge pull request #40 from red-hat-data-services/MohammadiIram-patch-3
MohammadiIram Nov 11, 2024
fe38558
Use Go toolset 1.22 image for Konflux build
sutaakar Nov 15, 2024
9746c17
Merge remote-tracking branch 'upstream/main'
dchourasia Nov 16, 2024
8494e4b
remove rpm files and update renovate config
MohammadiIram Nov 18, 2024
3d20059
Merge pull request #44 from red-hat-data-services/clearfiles
MohammadiIram Nov 18, 2024
e098334
Merge remote-tracking branch 'upstream/main'
dchourasia Nov 21, 2024
83b3771
Update renovate.json
MohammadiIram Nov 25, 2024
18cb190
Update renovate.json
MohammadiIram Nov 25, 2024
e63ccc3
Merge remote-tracking branch 'upstream/main'
dchourasia Nov 28, 2024
4063410
Merge remote-tracking branch 'upstream/main'
ChristianZaccaria Nov 28, 2024
7497358
Merge remote-tracking branch 'upstream/main'
dchourasia Nov 29, 2024
548fcd4
Update registry.access.redhat.com/ubi8/go-toolset:1.22 Docker digest …
konflux-internal-p02[bot] Dec 2, 2024
460201e
Update registry.access.redhat.com/ubi8/go-toolset Docker tag to v1.22…
konflux-internal-p02[bot] Dec 3, 2024
03d689c
Update registry.access.redhat.com/ubi8/go-toolset:1.22 Docker digest …
konflux-internal-p02[bot] Dec 13, 2024
1598f49
Update registry.access.redhat.com/ubi8/go-toolset Docker tag to v1.22…
konflux-internal-p02[bot] Dec 13, 2024
03c9af9
Merge remote-tracking branch 'upstream/main'
dchourasia Dec 17, 2024
26f9d9a
Update Dockerfile.konflux
MohammadiIram Dec 17, 2024
e852cad
sync config with renovate-central
rhods-devops-app[bot] Dec 17, 2024
67f4899
Update renovate.json
MohammadiIram Dec 17, 2024
7e40209
Update registry.access.redhat.com/ubi8/go-toolset:1.22 Docker digest …
konflux-internal-p02[bot] Dec 17, 2024
3215c4a
Merge remote-tracking branch 'upstream/main'
dchourasia Dec 18, 2024
3f958de
Update Dockerfile Digest Updates
konflux-internal-p02[bot] Dec 18, 2024
aba035f
Merge remote-tracking branch 'upstream/main'
dchourasia Dec 19, 2024
ac4a0ee
Merge remote-tracking branch 'upstream/main'
dchourasia Dec 21, 2024
09b4325
Update registry.access.redhat.com/ubi8/go-toolset:1.22 Docker digest …
konflux-internal-p02[bot] Jan 2, 2025
4ca24a7
Merge remote-tracking branch 'upstream/main'
dchourasia Jan 7, 2025
ff0176b
Merge remote-tracking branch 'upstream/main'
dchourasia Jan 9, 2025
e71b997
Merge remote-tracking branch 'upstream/main'
dchourasia Jan 10, 2025
f9bab19
Update registry.access.redhat.com/ubi8/go-toolset:1.22 Docker digest …
konflux-internal-p02[bot] Jan 13, 2025
774e316
Update registry.access.redhat.com/ubi8/go-toolset:1.22 Docker digest …
konflux-internal-p02[bot] Jan 16, 2025
8865a16
Merge remote-tracking branch 'upstream/main'
dchourasia Jan 21, 2025
d298770
Merge remote-tracking branch 'upstream/main'
dchourasia Jan 22, 2025
d5c04a9
sync config with renovate-central
rhods-devops-app[bot] Jan 23, 2025
2fb5fb5
Merge remote-tracking branch 'upstream/main'
MarianMacik Jan 23, 2025
0b3ad0b
sync config with renovate-central
rhods-devops-app[bot] Jan 27, 2025
3793f2a
Merge remote-tracking branch 'upstream/main'
dchourasia Jan 29, 2025
e4e6d1f
Update Dockerfile Digest Updates
konflux-internal-p02[bot] Jan 29, 2025
0db5047
Apply go toolset workaround from upstream
sutaakar Feb 5, 2025
6dff012
Merge branch 'opendatahub-io:main' into main
sutaakar Feb 5, 2025
4f3ee0f
Apply Go lang 1.23 workaround for Dockerfile.konflux
sutaakar Feb 5, 2025
3798127
Update Dockerfile Digest Updates
konflux-internal-p02[bot] Feb 5, 2025
d77ed3b
Merge remote-tracking branch 'upstream/main'
dchourasia Feb 9, 2025
c6e6adf
Merge remote-tracking branch 'upstream/main'
dchourasia Feb 11, 2025
c616fe5
Merge remote-tracking branch 'upstream/main'
CFSNM Feb 11, 2025
e491103
Update renovate.json
MohammadiIram Feb 12, 2025
6088b5d
sync config with renovate-central
rhods-devops-app[bot] Feb 12, 2025
b8b1831
sync config with renovate-central
rhods-devops-app[bot] Feb 12, 2025
f4d19dc
Pin openshift-golang-builder to 1.23 rhel8 tag
grdryn Feb 13, 2025
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
124 changes: 124 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:recommended"],
"branchPrefix": "renovate/",
"baseBranches": ["main", "rhoai-2.16", "rhoai-2.17", "rhoai-2.13", "rhoai-2.18"],
"ignoreTests": true,
"automergeType": "pr",
"automerge": true,
"enabledManagers": ["dockerfile", "tekton", "rpm"],
"packageRules": [
{
"matchManagers": ["dockerfile"],
"matchBaseBranches": ["main", "rhoai-2.16", "rhoai-2.17", "rhoai-2.13"],
"matchUpdateTypes": ["digest"],
"matchFileNames": ["*Dockerfile.konflux*"],
"enabled": true,
"ignoreTests": true,
"automergeType": "pr",
"automerge": true,
"groupName": "Dockerfile Digest Updates",
"branchPrefix": "renovate/docker-main/",
"semanticCommits": "enabled"
},
{
"matchManagers": ["dockerfile"],
"matchBaseBranches": ["rhoai-2.18"],
"enabled": false
},
{
"matchManagers": ["tekton"],
"matchBaseBranches": ["rhoai-2.16", "rhoai-2.17", "rhoai-2.13"],
"matchUpdateTypes": ["digest"],
"enabled": true,
"groupName": "Tekton Updates",
"branchPrefix": "renovate/tekton-rhoai-2.16/",
"semanticCommits": "enabled",
"prFooter": "To execute skipped test pipelines write comment `/ok-to-test`",
"matchPackageNames": [
"/^quay.io/redhat-appstudio-tekton-catalog//",
"/^quay.io/konflux-ci/tekton-catalog//"
]
},
{
"matchManagers": ["rpm"],
"matchBaseBranches": ["main", "rhoai-2.16", "rhoai-2.17", "rhoai-2.13"],
"groupName": "RPM Updates",
"commitMessageTopic": "RPM updates",
"enabled": true,
"schedule": ["at any time"],
"branchPrefix": "renovate/rpm/",
"semanticCommits": "enabled"
}
],
"dockerfile": {
"enabled": true,
"schedule": ["at any time"],
"additionalBranchPrefix": "{{baseBranch}}/",
"branchPrefix": "konflux/mintmaker/",
"ignoreTests": true,
"automergeType": "pr",
"automerge": true,
"packageRules": [
{
"matchUpdateTypes": [
"major",
"minor",
"pin",
"pinDigest",
"patch",
"bump"
],
"enabled": false
}
],
"ignorePaths": [
"**/Dockerfile",
"!**/Dockerfile.konflux*"
],
"pinDigests": true
},
"tekton": {
"enabled": true,
"schedule": ["at any time"],
"fileMatch": ["\\.yaml$", "\\.yml$"],
"includePaths": [".tekton/**"],
"packageRules": [
{
"matchUpdateTypes": [
"major",
"minor",
"pin",
"pinDigest",
"patch",
"bump"
],
"enabled": false
},
{
"matchUpdateTypes": ["digest"],
"enabled": true,
"groupName": "Konflux references",
"branchPrefix": "konflux/references/",
"semanticCommits": "enabled",
"prFooter": "To execute skipped test pipelines write comment `/ok-to-test`",
"prBodyColumns": ["Package", "Change", "Notes"],
"prBodyDefinitions": {
"Notes": "{{#if (or (containsString updateType 'minor') (containsString updateType 'major'))}}:warning:[migration](https://github.com/redhat-appstudio/build-definitions/blob/main/task/{{{replace '^quay.io/(redhat-appstudio-tekton-catalog|konflux-ci/tekton-catalog)/task-' '' packageName}}}/{{{newVersion}}}/MIGRATION.md):warning:{{/if}}"
},
"prBodyTemplate": "{{{header}}}{{{table}}}{{{notes}}}{{{changelogs}}}{{{controls}}}{{{footer}}}",
"recreateWhen": "always",
"rebaseWhen": "behind-base-branch",
"matchPackageNames": [
"/^quay.io/redhat-appstudio-tekton-catalog//",
"/^quay.io/konflux-ci/tekton-catalog//"
]
}
]
},
"rpm": {
"enabled": true,
"schedule": ["at any time"]
},
"prHourlyLimit": 0
}
63 changes: 63 additions & 0 deletions Dockerfile.konflux
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Build arguments
ARG SOURCE_CODE=.

# BEGIN -- workaround lack of go-toolset for golang 1.23
ARG GOLANG_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23@sha256:ca0c771ecd4f606986253f747e2773fe2960a6b5e8e7a52f6a4797b173ac7f56
FROM ${GOLANG_IMAGE} AS golang

FROM registry.access.redhat.com/ubi8/ubi@sha256:fd93fc09dc09f3d3edae30577460a979bb52df351b826ef3a5c02ec8213b433a AS builder
ARG GOLANG_VERSION=1.23.0

# Install system dependencies
RUN dnf upgrade -y && dnf install -y \
gcc \
make \
openssl-devel \
git \
&& dnf clean all && rm -rf /var/cache/yum

# Install Go
ENV PATH=/usr/local/go/bin:$PATH

COPY --from=golang /usr/lib/golang /usr/local/go
# End of Go versioning workaround

WORKDIR /workspace

# Copy the Go Modules manifests
COPY go.mod go.mod
COPY go.sum go.sum
# cache deps before building and copying source so that we don't need to re-download as much
# and so that source changes don't invalidate our downloaded layer
RUN go mod download

# Copy the go source
COPY . .

# Copy the Go sources
COPY main.go main.go
COPY pkg/ pkg/

RUN git config --global --add safe.directory /workspace

# Build
USER root

RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags strictfipsruntime -a -o manager main.go

FROM registry.access.redhat.com/ubi8/ubi-minimal@sha256:d16d4445b1567f29449fba3b6d2bc37db467dc3067d33e940477e55aecdf6e8e
WORKDIR /
COPY --from=builder /workspace/manager .

USER 65532:65532
ENTRYPOINT ["/manager"]

LABEL com.redhat.component="odh-codeflare-operator-container" \
description="Manages lifecycle of MCAD and InstaScale custom resources and associated Kubernetes resources" \
name="managed-open-data-hub/odh-codeflare-operator-container-rhel8" \
summary="odh-codeflare-operator-container" \
maintainer="['[email protected]']" \
io.openshift.expose-services="" \
io.k8s.display-name="odh-codeflare-operator-container" \
io.k8s.description="odh-codeflare-operator" \
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
Loading