Add bindata for OLM release 0.17.0

Makefile

@@ -41,7 +41,7 @@ generate: build # Generate CLI docs and samples
 	go run ./hack/generate/samples/generate_testdata.go
 
 .PHONY: bindata
-OLM_VERSIONS = 0.16.1 0.15.1
+OLM_VERSIONS = 0.16.1 0.15.1 0.17.0
 bindata: ## Update project bindata
 	./hack/generate/olm_bindata.sh $(OLM_VERSIONS)
 

changelog/fragments/add-0.17.0-olm-bindata.yaml

@@ -0,0 +1,16 @@
+# entries is a list of entries to include in
+# release notes and/or the migration guide
+entries:
+  - description: >
+      Add OLM bindata for the 0.17.0 release version.
+
+    # kind is one of:
+    # - addition
+    # - change
+    # - deprecation
+    # - removal
+    # - bugfix
+    kind: "addition"
+
+    # Is this a breaking change?
+    breaking: false

hack/generate/olm_bindata.sh

@@ -1,9 +1,20 @@
 #!/usr/bin/env bash
 
+base_version=0.16.1
+
+function version_gt() {
+    test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1";
+}
+
 function get_olm_manifests() {
     echo "downloading olm manifests for version ${1}"
-    curl -L -o olm-manifests/$1-olm.yaml "https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${1}/olm.yaml"
-    curl -L -o olm-manifests/$1-crds.yaml "https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${1}/crds.yaml"
+    tag=$1
+    if version_gt ${1} $base_version; then
+        tag="v"$1
+    fi
+    echo "using the olm tag ${tag}"
+    curl -L -o olm-manifests/$1-olm.yaml "https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${tag}/olm.yaml"
+    curl -L -o olm-manifests/$1-crds.yaml "https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${tag}/crds.yaml"
 }
 
 function remove_olm_manifests {

hack/tests/integration.sh

@@ -27,7 +27,7 @@ popd
 # Install OLM on the cluster if not installed.
 olm_latest_exists=0
 if ! operator-sdk olm status > /dev/null 2>&1; then
-  operator-sdk olm install --version=0.15.1
+  operator-sdk olm install --version=0.17.0
   olm_latest_exists=1
 fi
 
@@ -40,5 +40,5 @@ header_text "Integration tests succeeded"
 
 # Uninstall OLM if it was installed for test purposes.
 if eval "(( $olm_latest_exists ))"; then
-  operator-sdk olm uninstall --version=0.15.1
+  operator-sdk olm uninstall --version=0.17.0
 fi

hack/tests/subcommand-olm-install.sh

@@ -37,4 +37,4 @@ test_version() {
 }
 
 test_version "latest"
-test_version "0.15.1" # Check installation of OLM for locally stored version of binaries
+test_version "0.17.0" # Check installation of OLM for locally stored version of binaries

internal/bindata/olm/versions.go

@@ -17,6 +17,7 @@ package olm
 var availableVersions = map[string]struct{}{
 	"0.16.1": {},
 	"0.15.1": {},
+	"0.17.0": {},
 }
 
 // HasVersion returns whether version maps to released OLM manifests as bindata.

internal/olm/installer/client.go

@@ -175,7 +175,7 @@ func (c Client) GetStatus(ctx context.Context, namespace, version string) (*olmr
 func (c Client) getResources(ctx context.Context, version string) ([]unstructured.Unstructured, error) {
 	log.Infof("Fetching CRDs for version %q", version)
 
-	version = formatVersion(version)
+	resolvedVersion := formatVersion(version)
 
 	var crdResources, olmResources []unstructured.Unstructured
 	var err error
@@ -196,13 +196,13 @@ func (c Client) getResources(ctx context.Context, version string) ([]unstructure
 			return nil, err
 		}
 	} else {
-		log.Infof("Fetching resources for resolved version %q", version)
-		crdResources, err = c.getCRDs(ctx, version)
+		log.Infof("Fetching resources for resolved version %q", resolvedVersion)
+		crdResources, err = c.getCRDs(ctx, resolvedVersion)
 		if err != nil {
 			return nil, fmt.Errorf("failed to fetch CRDs: %v", err)
 		}
 
-		olmResources, err = c.getOLM(ctx, version)
+		olmResources, err = c.getOLM(ctx, resolvedVersion)
 		if err != nil {
 			return nil, fmt.Errorf("failed to fetch resources: %v", err)
 		}

internal/testutils/olm.go

@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	OlmVersionForTestSuite = "0.15.1"
+	OlmVersionForTestSuite = "0.17.0"
 )
 
 var makefilePackagemanifestsFragment = `