From d1a956d04498d8343465b18d8207311dde6078f4 Mon Sep 17 00:00:00 2001 From: Gergely Brautigam <182850+Skarlso@users.noreply.github.com> Date: Fri, 25 Oct 2024 09:19:28 +0200 Subject: [PATCH] fix: correct the default URL for uninstalling ocm controller (#1013) #### What this PR does / why we need it #### Which issue(s) this PR fixes Fixes https://github.com/open-component-model/ocm-controller/issues/542 --------- Co-authored-by: Hilmar Falkenberg --- .../genericocireg/annotation_test.go | 1 + .../commands/controllercmds/uninstall/cmd.go | 2 +- .../ocmcmds/components/hash/cmd_test.go | 2 +- docs/reference/ocm_controller_uninstall.md | 2 +- docs/releasenotes/v0.17.0-rc.1.md | 34 ------------------- .../lib/tour/01-getting-started/README.md | 14 ++++---- 6 files changed, 11 insertions(+), 44 deletions(-) delete mode 100644 docs/releasenotes/v0.17.0-rc.1.md diff --git a/api/ocm/extensions/repositories/genericocireg/annotation_test.go b/api/ocm/extensions/repositories/genericocireg/annotation_test.go index 60ec0db94b..4d06e4fc61 100644 --- a/api/ocm/extensions/repositories/genericocireg/annotation_test.go +++ b/api/ocm/extensions/repositories/genericocireg/annotation_test.go @@ -5,6 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "ocm.software/ocm/api/helper/builder" + "ocm.software/ocm/api/oci/extensions/repositories/ctf" metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1" resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes" diff --git a/cmds/ocm/commands/controllercmds/uninstall/cmd.go b/cmds/ocm/commands/controllercmds/uninstall/cmd.go index 4261b22772..ef4148bb55 100644 --- a/cmds/ocm/commands/controllercmds/uninstall/cmd.go +++ b/cmds/ocm/commands/controllercmds/uninstall/cmd.go @@ -57,7 +57,7 @@ func (o *Command) ForName(name string) *cobra.Command { // AddFlags for the known item to delete. func (o *Command) AddFlags(set *pflag.FlagSet) { set.StringVarP(&o.Version, "version", "v", "latest", "the version of the controller to install") - set.StringVarP(&o.BaseURL, "base-url", "u", "https://ocm.software/ocm-controller/releases", "the base url to the ocm-controller's release page") + set.StringVarP(&o.BaseURL, "base-url", "u", "https://github.com/ocm-controller/releases", "the base url to the ocm-controller's release page") set.StringVarP(&o.ReleaseAPIURL, "release-api-url", "a", "https://api.github.com/repos/open-component-model/ocm-controller/releases", "the base url to the ocm-controller's API release page") set.StringVar(&o.CertManagerBaseURL, "cert-manager-base-url", "https://github.com/cert-manager/cert-manager/releases", "the base url to the cert-manager's release page") set.StringVar(&o.CertManagerReleaseAPIURL, "cert-manager-release-api-url", "https://api.github.com/repos/cert-manager/cert-manager/releases", "the base url to the cert-manager's API release page") diff --git a/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go index b0a4396a20..7783820f74 100644 --- a/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go @@ -7,12 +7,12 @@ import ( . "github.com/mandelsoft/goutils/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "ocm.software/ocm/api/ocm/extensions/repositories/ctf" . "ocm.software/ocm/cmds/ocm/testhelper" "ocm.software/ocm/api/ocm/compdesc" metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1" resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes" + "ocm.software/ocm/api/ocm/extensions/repositories/ctf" "ocm.software/ocm/api/utils/accessio" "ocm.software/ocm/api/utils/mime" ) diff --git a/docs/reference/ocm_controller_uninstall.md b/docs/reference/ocm_controller_uninstall.md index 43e1fd4537..65386338e2 100644 --- a/docs/reference/ocm_controller_uninstall.md +++ b/docs/reference/ocm_controller_uninstall.md @@ -9,7 +9,7 @@ ocm controller uninstall controller ### Options ```text - -u, --base-url string the base url to the ocm-controller's release page (default "https://ocm.software/ocm-controller/releases") + -u, --base-url string the base url to the ocm-controller's release page (default "https://github.com/ocm-controller/releases") --cert-manager-base-url string the base url to the cert-manager's release page (default "https://github.com/cert-manager/cert-manager/releases") --cert-manager-release-api-url string the base url to the cert-manager's API release page (default "https://api.github.com/repos/cert-manager/cert-manager/releases") --cert-manager-version string version for cert-manager (default "v1.13.2") diff --git a/docs/releasenotes/v0.17.0-rc.1.md b/docs/releasenotes/v0.17.0-rc.1.md deleted file mode 100644 index 3039ec82dc..0000000000 --- a/docs/releasenotes/v0.17.0-rc.1.md +++ /dev/null @@ -1,34 +0,0 @@ -# Release v0.17.0-rc.1 - -- chore: update 'flake.nix' (#1012) -- Revert "feat: replace docker with oras (#904)" (#1005) -- !OCI Annotations change in Component Descriptor for Component Versions: \`ocm-artifact\` -> \`software.ocm.artifact\` and introduce \`software.ocm.creator\` (#987) -- Upgrade levenshtein dependency (#1009) -- Introduce update state on CV implementation API (#976) -- documentation: fix uploader documentation (#991) -- documentation: Update the installation options (#979) -- chore: reduce cache pressure by early deleting cache entries after PR closure (#986) - -## 🐛 Bug Fixes - -- fix!(release): retract 0.16.0-z (#1006) -- Fix/publish release (#1001) -- chore: fixes for docu + cleanup test leftovers (#993) - -## 🧰 Maintenance - -
-5 changes - -- chore(release): also call make generate to update files (#992) -- chore(ci): remove i386, optimize latest build and add various comments (#1010) -- chore(ci): use reusable stale bot configuration (#1008) -- chore(ci): add stale bot for issues (#1002) -- chore(ci): make sure we use candidates and branches by default (#1004) -
- -## ⬆️ Dependencies - -- chore(deps): bump the go group with 5 updates (#989) -- chore(deps): bump anchore/sbom-action from 0.17.3 to 0.17.4 in the ci group (#988) - diff --git a/examples/lib/tour/01-getting-started/README.md b/examples/lib/tour/01-getting-started/README.md index eef92cf8c4..33abc6f3ed 100644 --- a/examples/lib/tour/01-getting-started/README.md +++ b/examples/lib/tour/01-getting-started/README.md @@ -168,32 +168,32 @@ differ, because the code always describes the latest version): ```text resources of the latest version: - version: 0.16.2 + version: 0.17.0-rc.1 provider: ocm.software 1: name: ocmcli extra identity: "architecture"="amd64","os"="linux" resource type: executable - access: Local blob sha256:b199a1e6558af64898cf0af5245907a12ff3ce152926e30a1a446c8aa6f85fec[] + access: Local blob sha256:e02e4e177a41fd86d2c63f7b7769e2d403c53b10d802f1fe57b5759305b64b32[] 2: name: ocmcli extra identity: "architecture"="arm64","os"="linux" resource type: executable - access: Local blob sha256:b942839e4e86286ad702a9bfbdc30100c970e6ed1d6e45de3a06b67998f746bf[] + access: Local blob sha256:10ff2b950bb26601e497c317289a2fcc1a5ccee4ba5c7dff842cac6d2d78c2ba[] 3: name: ocmcli extra identity: "architecture"="arm64","os"="darwin" resource type: executable - access: Local blob sha256:827662585090c8fe0ffb0e3380b2219a0f1ef65d1e320767b2bdf5723bf0ac31[] + access: Local blob sha256:b033848ab254b52eea5389bb58e1caaa4cf896a1beef95d15187a8466ce3d861[] 4: name: ocmcli extra identity: "architecture"="amd64","os"="darwin" resource type: executable - access: Local blob sha256:c33865145684d2bf45fd50a80dd5435f3bf3f7153058126589e8a92f369205a4[] + access: Local blob sha256:15d86a60ade3ec5036ce71a163b7b92745f6ce7cdf755aa5123b811e2c5909ca[] 5: name: ocmcli extra identity: "architecture"="amd64","os"="windows" resource type: executable - access: Local blob sha256:97057f0822fb137b872c94f81c24618a3df25ea14bd956fea85464c6e8465661[] + access: Local blob sha256:72b6c6aa0b5116892972f7152306bd5b44ffce04f2832dc4557d900a921f7614[] 6: name: ocmcli-image extra identity: resource type: ociImage - access: OCI artifact ghcr.io/open-component-model/ocm/ocm.software/ocmcli/ocmcli-image:0.16.2@sha256:491c08697c6a0be0f0a2d468377eff4deb271b68169a8cf8eb992c553da32df8 + access: OCI artifact ghcr.io/open-component-model/ocm/ocm.software/ocmcli/ocmcli-image:0.17.0-rc.1@sha256:c7627052f1dfcc1dbe0be508466387b0af9bc48d7942911f308b91e3b35ff30c ``` Resources have some metadata, like their identity and a resource type.