Skip to content

Commit

Permalink
move away from latest tag for olm installs (#6849)
Browse files Browse the repository at this point in the history
Signed-off-by: Adam D. Cornett <adc@redhat.com>
  • Loading branch information
acornett21 authored Oct 30, 2024
1 parent 94f7db3 commit 4c30e49
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 54 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ generate: build # Generate CLI docs and samples
$(GO) generate ./...

.PHONY: bindata
OLM_VERSIONS = 0.25.0 0.26.0 0.27.0
OLM_VERSIONS = 0.26.0 0.27.0 0.28.0
bindata: ## Update project bindata
./hack/generate/olm_bindata.sh $(OLM_VERSIONS)
$(MAKE) fix
Expand Down
2 changes: 1 addition & 1 deletion hack/tests/subcommand-olm-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ test_version() {
echo $commandoutput | grep -F "Successfully uninstalled OLM"
}

test_version "latest"
test_version "0.28.0"
test_version "0.17.0" # Check installation of OLM for locally stored version of binaries
96 changes: 48 additions & 48 deletions internal/bindata/olm/manifests.go

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion internal/olm/installer/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ import (
)

const (
DefaultVersion = "latest"
// TODO: switch back to latest once olm fixes their releases
// https://github.com/operator-framework/operator-lifecycle-manager/issues/3419
DefaultVersion = "0.28.0"
DefaultTimeout = time.Minute * 2
// DefaultOLMNamespace is the namespace where OLM is installed
DefaultOLMNamespace = "olm"
Expand Down
2 changes: 1 addition & 1 deletion internal/testutils/olm.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
)

const (
OlmVersionForTestSuite = "0.27.0"
OlmVersionForTestSuite = "0.28.0"
)

var makefilePackagemanifestsFragment = `
Expand Down
2 changes: 1 addition & 1 deletion website/content/en/docs/cli/operator-sdk_olm_install.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ operator-sdk olm install [flags]
```
-h, --help help for install
--timeout duration time to wait for the command to complete before failing (default 2m0s)
--version string version of OLM resources to install (default "latest")
--version string version of OLM resources to install (default "0.28.0")
```

### Options inherited from parent commands
Expand Down
2 changes: 1 addition & 1 deletion website/content/en/docs/overview/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ By project type (replace `${IMAGE_VERSION}` with base image version in your proj

Operator SDK officially supports the latest 3 minor versions of OLM present at the time of a given Operator SDK release. These versions of OLM manifests are packaged with the SDK binary in the form of `bindata` to support low-latency installations of OLM with [`operator-sdk olm install`][olm-install-cmd]. Any other version installed with this command may work but is not tested nor officially supported.

Currently, the officially supported OLM Versions are: 0.25.0, 0.26.0, and 0.27.0
Currently, the officially supported OLM Versions are: 0.26.0, 0.27.0, and 0.28.0

## Platform support

Expand Down

0 comments on commit 4c30e49

Please sign in to comment.