Skip to content
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.

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

bump kube to 1.17 and pull latest library-go #232

Merged
merged 5 commits into from Jan 7, 2020

Conversation

stlaz
Copy link
Member

@stlaz stlaz commented Jan 3, 2020

Building the operator images fails because OSBS builders are disconnected from the internets but the builder image tries to use go mod and fails on dependency pulls.

Latest library-go forces using the vendor directory in builds.

This PR also bumps the builder images in Dockerfiles to golang-1.13

cc @tnozicka @sanchezl @vareti

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 3, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 3, 2020
@stlaz
Copy link
Member Author

stlaz commented Jan 3, 2020

/test e2e-aws

@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd drop this whole file as we have done in other repos. There is no OKD yet and registry.svc.ci.openshift.org/openshift/origin-v4.0:base is actually OCP anyways

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI was using wrong dockerfile, pls drop it in a followup

go.mod Outdated
)

replace (
github.com/openshift/api => github.com/openshift/api v3.9.1-0.20191209132752-992bc3a41fe6+incompatible
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20191205152420-9faca5198b4f
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20191211124107-e0f1590a316e
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20200103110434-cd8a585d2a77
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we aim at using require here

@stlaz
Copy link
Member Author

stlaz commented Jan 6, 2020

@tnozicka I think I will be able to drop Dockerfile only after the dependent CI PR merged

edit: the second comment should be addressed now

go.mod Outdated Show resolved Hide resolved
@mfojtik
Copy link
Member

mfojtik commented Jan 7, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mfojtik, stlaz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 1683b59 into openshift:master Jan 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants