Skip to content

Commit

Permalink
Merge pull request #214 from stlaz/art-update-413
Browse files Browse the repository at this point in the history
[4.13] OCPBUGS-16806: Updating ose-service-ca-operator images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Jul 27, 2023
2 parents 1b89fdc + dc83cc9 commit 5984aac
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.18-openshift-4.11
tag: rhel-8-release-golang-1.19-openshift-4.13
4 changes: 2 additions & 2 deletions Dockerfile.rhel7
@@ -1,10 +1,10 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.13 AS builder
WORKDIR /go/src/github.com/openshift/service-ca-operator
COPY . .
ENV GO_PACKAGE github.com/openshift/service-ca-operator
RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" ./cmd/service-ca-operator

FROM registry.ci.openshift.org/ocp/4.11:base
FROM registry.ci.openshift.org/ocp/4.13:base
COPY --from=builder /go/src/github.com/openshift/service-ca-operator/service-ca-operator /usr/bin/
COPY manifests /manifests
# Using the vendored CRD ensures compatibility with 'oc explain'
Expand Down
2 changes: 1 addition & 1 deletion go.mod
@@ -1,6 +1,6 @@
module github.com/openshift/service-ca-operator

go 1.18
go 1.19

require (
github.com/go-bindata/go-bindata v3.1.2+incompatible
Expand Down
12 changes: 7 additions & 5 deletions pkg/operator/v4_00_assets/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5984aac

Please sign in to comment.