Skip to content

deps: bump to k8s v1.17#2746

Merged
estroz merged 11 commits intooperator-framework:masterfrom
estroz:deps/k8s-1.17-registry-1.6.2
Mar 31, 2020
Merged

deps: bump to k8s v1.17#2746
estroz merged 11 commits intooperator-framework:masterfrom
estroz:deps/k8s-1.17-registry-1.6.2

Conversation

@estroz
Copy link
Member

@estroz estroz commented Mar 31, 2020

Description of the change:

  • bump all deps to their k8s v1.17 equivalents; various code/doc updates from broken API's.
  • bundle create: fix issue where manifests/ is expected by the operator-registry image builder but not generated by the SDK. In case deploy/olm-catalog//manifests doesn't exist, create one and delete it after the image is done building. If --generate-only is set, do not remove manifests/. Also add tests

Motivation for the change: support new(er) version of k8s

Supercedes #2715, #2702
Fixes #2030

/area dependency

@openshift-ci-robot openshift-ci-robot added the area/dependency Issues or PRs related to dependency changes label Mar 31, 2020
kevinrizza and others added 5 commits March 30, 2020 20:21
*Update operator-registry dependency to 1.6.0
*Adds fix for generated dockerfiles
*Adds optional output-directory parameter
*Update cleanup funcs to handle new structure
operator-registry image builder but not generated by the SDK.
In case deploy/olm-catalog/<operator-name>/manifests doesn't
exist, create one and delete it after the image is done
building. If --generate-only is set, do not remove manifests/.

hack/tests: add 'bundle create' test cases

doc,website: update generated CLI docs

CHANGELOG.md: --output-dir addition and breaking change for bundle.Dockerfile location

doc/migration: add breaking change to migration guide
@estroz estroz force-pushed the deps/k8s-1.17-registry-1.6.2 branch from 9bfd942 to 955ba23 Compare March 31, 2020 04:01
@estroz estroz force-pushed the deps/k8s-1.17-registry-1.6.2 branch from da7c1f1 to 2d5ce1a Compare March 31, 2020 04:53
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 31, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 31, 2020
Copy link
Contributor

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 31, 2020
@estroz estroz force-pushed the deps/k8s-1.17-registry-1.6.2 branch from d3b7e3d to ed8269b Compare March 31, 2020 16:30
Comment on lines +5 to +31
function check_dir() {
if [[ $3 == 0 ]]; then
if [[ -d "$2" ]]; then
error_text "${1}: directory ${2} should not exist"
exit 1
fi
else
if [[ ! -d "$2" ]]; then
error_text "${1}: directory ${2} should exist"
exit 1
fi
fi
}

function check_file() {
if [[ $3 == 0 ]]; then
if [[ -f "$2" ]]; then
error_text "${1}: file ${2} should not exist"
exit 1
fi
else
if [[ ! -f "$2" ]]; then
error_text "${1}: file ${2} should exist"
exit 1
fi
fi
}
Copy link
Member

Choose a reason for hiding this comment

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

Nit: move these to test_lib.sh?

Copy link
Member Author

Choose a reason for hiding this comment

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

Will do that in #2737 when I add validate tests.

Copy link
Member

@joelanford joelanford left a comment

Choose a reason for hiding this comment

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

LGTM

@estroz estroz merged commit a00c1b7 into operator-framework:master Mar 31, 2020
@estroz estroz deleted the deps/k8s-1.17-registry-1.6.2 branch March 31, 2020 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/dependency Issues or PRs related to dependency changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Drop dependency on k8s.io/kubernetes

5 participants