deps: bump to k8s v1.17 (operator-framework#2746)

Upgrade all dependencies to their k8s v1.17 equivalent versions, and update APIs broken by these changes. * 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/<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 * Makefile: bump K8S_VERSION to v1.17.2 * doc,website: add breaking change to migration guide, update CLI docs * CHANGELOG.md: --output-dir and --output additions, breaking changes for bundle.Dockerfile and version bumps Co-authored-by: kevinrizza <[email protected]> Co-authored-by: Camila Macedo <[email protected]>
wuranjia · Mar 31, 2020 · a00c1b7 · a00c1b7
1 parent c97e53b
commit a00c1b7
Show file tree

Hide file tree

Showing 29 changed files with 2,117 additions and 1,057 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,19 @@
 - The methods `ctx.GetOperatorNamespace()` and `ctx.GetWatchNamespace()` was added `pkg/test` in order to replace `ctx.GetNamespace()` which is  deprecated. ([#2617](https://github.com/operator-framework/operator-sdk/pull/2617))
 - The `--crd-version` flag was added to the `new`, `add api`, `add crd`, and `generate crds` commands so that users can opt-in to `v1` CRDs. ([#2684](https://github.com/operator-framework/operator-sdk/pull/2684))
 - The printout for the compatible Kubernetes Version [#2446](https://github.com/operator-framework/operator-sdk/pull/2446)
+- The `--output-dir` flag instructs [`operator-sdk bundle create`](./doc/cli/operator-sdk_bundle_create.md) to write manifests and metadata to a non-default directory. ([#2715](https://github.com/operator-framework/operator-sdk/pull/2715))
+- The `--overwrite` flag instructs [`operator-sdk bundle create`](./doc/cli/operator-sdk_bundle_create.md) to overwrite metadata, manifests, and `bundle.Dockerfile`. ([#2715](https://github.com/operator-framework/operator-sdk/pull/2715))
 
 ### Changed
 
 - The scorecard when creating a Custom Resource, will produce a message to the user if that CR already exists. ([#2683](https://github.com/operator-framework/operator-sdk/pull/2683))
+- Upgrade Kubernetes dependency versions from `v1.16.2` to `v1.17.4`. ([#2715](https://github.com/operator-framework/operator-sdk/pull/2715))
+- Upgrade `controller-runtime` version from `v0.4.0` to `v0.5.2`. ([#2715](https://github.com/operator-framework/operator-sdk/pull/2715))
+- Upgrade `controller-tools` version from `v0.2.4` to `v0.2.8`. ([#2715](https://github.com/operator-framework/operator-sdk/pull/2715))
+- Upgrade `helm` version from `v3.0.2` to `v3.1.2`. ([#2715](https://github.com/operator-framework/operator-sdk/pull/2715))
+- Upgrade `prometheus-operator` version from `v0.34.0` to `v0.38.0`. ([#2715](https://github.com/operator-framework/operator-sdk/pull/2715))
+- Upgrade `operator-registry` version from `v1.5.7`to `v1.6.2`. ([#2715](https://github.com/operator-framework/operator-sdk/pull/2715))
+- **Breaking Change:** [`operator-sdk bundle create`](./doc/cli/operator-sdk_bundle_create.md) now creates a `manifests/` directory under the parent directory of the argument passed to `--directory`, and setting `--generate-only=true` writes a Dockerfile to `<project-root>/bundle.Dockerfile` that copies bundle manifests from that `manifests/` directory. ([#2715](https://github.com/operator-framework/operator-sdk/pull/2715))
 
 ### Deprecated
 

diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ endif
 
 VERSION = $(shell git describe --dirty --tags --always)
 GIT_COMMIT = $(shell git rev-parse HEAD)
-K8S_VERSION = v1.16.3
+K8S_VERSION = v1.17.2
 REPO = github.com/operator-framework/operator-sdk
 BUILD_PATH = $(REPO)/cmd/operator-sdk
 PKGS = $(shell go list ./... | grep -v /vendor/)
@@ -218,6 +218,7 @@ test-ci: test-markdown test-sanity test-unit install test-subcommand test-e2e ##
 .PHONY: test-subcommand test-subcommand-local test-subcommand-scorecard test-subcommand-olm-install
 
 test-subcommand: test-subcommand-local test-subcommand-scorecard test-subcommand-olm-install
+	./hack/tests/subcommand-bundle.sh
 
 test-subcommand-local:
 	./hack/tests/subcommand.sh

diff --git a/cmd/operator-sdk/bundle/cmd.go b/cmd/operator-sdk/bundle/cmd.go
@@ -15,13 +15,20 @@
 package bundle
 
 import (
-	"os"
-	"path/filepath"
-
-	"github.com/operator-framework/operator-registry/pkg/lib/bundle"
 	"github.com/spf13/cobra"
 )
 
+//nolint:structcheck
+type bundleCmd struct {
+	directory      string
+	packageName    string
+	imageTag       string
+	imageBuilder   string
+	defaultChannel string
+	channels       string
+	generateOnly   bool
+}
+
 func NewCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "bundle",
@@ -39,39 +46,3 @@ https://github.com/openshift/enhancements/blob/master/enhancements/olm/operator-
 	)
 	return cmd
 }
-
-type bundleCmd struct {
-	directory      string
-	packageName    string
-	imageTag       string
-	imageBuilder   string
-	defaultChannel string
-	channels       []string
-	generateOnly   bool
-}
-
-// cleanupFuncs returns a set of general funcs to clean up after a bundle
-// subcommand.
-func (c bundleCmd) cleanupFuncs() (fs []func()) {
-	metaDir := filepath.Join(c.directory, bundle.MetadataDir)
-	dockerFile := filepath.Join(c.directory, bundle.DockerFile)
-	metaExists := isExist(metaDir)
-	dockerFileExists := isExist(dockerFile)
-	fs = append(fs,
-		func() {
-			if !metaExists {
-				_ = os.RemoveAll(metaDir)
-			}
-		},
-		func() {
-			if !dockerFileExists {
-				_ = os.RemoveAll(dockerFile)
-			}
-		})
-	return fs
-}
-
-func isExist(path string) bool {
-	_, err := os.Stat(path)
-	return os.IsExist(err)
-}