Skip to content

Commit

Permalink
Cr 17631 (#683)
Browse files Browse the repository at this point in the history
* Use stable version of add-cluster when using a helm-runtime

* fixed according to code review

* ran codegen
  • Loading branch information
danielm-codefresh authored Mar 14, 2023
1 parent 9c96245 commit d045e79
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=v0.1.38
VERSION=v0.1.39

OUT_DIR=dist
YEAR?=$(shell date +"%Y")
Expand Down
7 changes: 6 additions & 1 deletion cmd/commands/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,12 @@ func runClusterAdd(ctx context.Context, opts *ClusterAddOptions) error {
log.G(ctx).Info("Building \"add-cluster\" manifests")

csdpToken := cfConfig.GetCurrentContext().Token
manifests, nameSuffix, err := createAddClusterManifests(opts, ingressUrl, server, csdpToken, version.String())
addClusterRef := version.String()
if runtime.InstallationType == model.InstallationTypeHelm {
addClusterRef = "stable"
}

manifests, nameSuffix, err := createAddClusterManifests(opts, ingressUrl, server, csdpToken, addClusterRef)
if err != nil {
return fmt.Errorf("failed getting add-cluster resources: %w", err)
}
Expand Down
1 change: 0 additions & 1 deletion cmd/commands/runtime_install.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ func NewRuntimeInstallCommand() *cobra.Command {
installationOpts.kubeconfig = cmd.Flag("kubeconfig").Value.String()

util.Die(cmd.Flags().MarkHidden("bypass-ingress-class-check"))
util.Die(cmd.Flags().MarkHidden("access-mode"))
util.Die(cmd.Flags().MarkHidden("tunnel-register-host"))
util.Die(cmd.Flags().MarkHidden("tunnel-domain"))
util.Die(cmd.Flags().MarkHidden("ips-allow-list"))
Expand Down
1 change: 1 addition & 0 deletions docs/commands/cli-v2_runtime_install.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ cli-v2 runtime install [runtime_name] [flags]
### Options

```
--access-mode string The access mode to the cluster, one of: ingress|tunnel
--context string The name of the kubeconfig context to use
--demo-resources Installs demo resources (default: true) (default true)
--disable-rollback If true, will not perform installation rollback after a failed installation
Expand Down
4 changes: 2 additions & 2 deletions docs/releases/release_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cf version

```bash
# download and extract the binary
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.38/cf-linux-amd64.tar.gz | tar zx
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.39/cf-linux-amd64.tar.gz | tar zx

# move the binary to your $PATH
mv ./cf-linux-amd64 /usr/local/bin/cf
Expand All @@ -36,7 +36,7 @@ cf version

```bash
# download and extract the binary
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.38/cf-darwin-amd64.tar.gz | tar zx
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.39/cf-darwin-amd64.tar.gz | tar zx

# move the binary to your $PATH
mv ./cf-darwin-amd64 /usr/local/bin/cf
Expand Down

0 comments on commit d045e79

Please sign in to comment.