Skip to content

[release-4.12] update CI build root and Dockerfile tags to ART 4.12 streams #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sunku5494 wants to merge 1 commit into
base: release-4.12
Choose a base branch
from
Open

[release-4.12] update CI build root and Dockerfile tags to ART 4.12 streams #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: golang-1.17
tag: rhel-8-release-golang-1.19-openshift-4.12
4 changes: 2 additions & 2 deletions openshift/Dockerfile.openshift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.12 AS builder

WORKDIR /build
COPY . .
Expand All @@ -7,7 +7,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=${GOOS} GOPROXY=${GOPROXY} go build \
-o=cluster-api-controller-manager \
main.go

FROM registry.ci.openshift.org/ocp/4.11:base
FROM registry.ci.openshift.org/ocp/4.12:base

LABEL description="Cluster API Controller Manager"

Expand Down
13 changes: 13 additions & 0 deletions test.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/controllers/remote/cluster_test.go b/controllers/remote/cluster_test.go
index 0fe782b62..f22554ea1 100644
--- a/controllers/remote/cluster_test.go
+++ b/controllers/remote/cluster_test.go
@@ -92,7 +92,7 @@ func TestNewClusterClient(t *testing.T) {
_, err := NewClusterClient(ctx, "test-source", client, clusterWithValidKubeConfig)
// Since we do not have a remote server to connect to, we should expect to get
// an error to that effect for the purpose of this test.
- gs.Expect(err).To(MatchError(ContainSubstring("no such host")))
+ gs.Expect(err).To(MatchError(Or(ContainSubstring("no such host"), ContainSubstring("No address associated with hostname"))))

restConfig, err := RESTConfig(ctx, "test-source", client, clusterWithValidKubeConfig)
gs.Expect(err).NotTo(HaveOccurred())