Skip to content

Commit db6dcc2

Browse files
wip
1 parent df97e68 commit db6dcc2

File tree

4 files changed

+5
-39
lines changed

4 files changed

+5
-39
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=v0.1.9
1+
VERSION=v0.1.10
22

33
OUT_DIR=dist
44
YEAR?=$(shell date +"%Y")

cmd/commands/common.go

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -87,34 +87,6 @@ func isValidIngressHost(ingressHost string) (bool, error) {
8787
return regexp.MatchString(`^(http|https)://`, ingressHost)
8888
}
8989

90-
func askUserIfToInstallDemoResources(cmd *cobra.Command, sampleInstall *bool) error {
91-
if !store.Get().Silent && !cmd.Flags().Changed("demo-resources") {
92-
templates := &promptui.SelectTemplates{
93-
Selected: "{{ . | yellow }} ",
94-
}
95-
96-
labelStr := fmt.Sprintf("%vInstall Codefresh demo resources?%v", CYAN, COLOR_RESET)
97-
98-
prompt := promptui.Select{
99-
Label: labelStr,
100-
Items: []string{"Yes (default)", "No"},
101-
Templates: templates,
102-
}
103-
104-
_, result, err := prompt.Run()
105-
106-
if err != nil {
107-
return err
108-
}
109-
110-
if result == "No" {
111-
*sampleInstall = false
112-
}
113-
}
114-
115-
return nil
116-
}
117-
11890
func ensureRepo(cmd *cobra.Command, runtimeName string, cloneOpts *apgit.CloneOptions, fromAPI bool) error {
11991
ctx := cmd.Context()
12092
if cloneOpts.Repo != "" {

cmd/commands/runtime_install.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
245245
cmd.Flags().StringVar(&installationOpts.GitIntegrationRegistrationOpts.Username, "personal-git-user", "", "The Personal git user that match the token, required for bitbucket cloud")
246246
cmd.Flags().StringVar(&installationOpts.versionStr, "version", "", "The runtime version to install (default: stable)")
247247
cmd.Flags().StringVar(&installationOpts.SuggestedSharedConfigRepo, "shared-config-repo", "", "URL to the shared configurations repo. (default: <installation-repo> or the existing one for this account)")
248-
cmd.Flags().BoolVar(&installationOpts.InstallDemoResources, "demo-resources", true, "Installs demo resources (default: true)")
248+
cmd.Flags().BoolVar(&installationOpts.InstallDemoResources, "demo-resources", false, "Installs demo resources (default: true)")
249249
cmd.Flags().BoolVar(&installationOpts.SkipClusterChecks, "skip-cluster-checks", false, "Skips the cluster's checks")
250250
cmd.Flags().BoolVar(&installationOpts.DisableRollback, "disable-rollback", false, "If true, will not perform installation rollback after a failed installation")
251251
cmd.Flags().DurationVar(&store.Get().WaitTimeout, "wait-timeout", store.Get().WaitTimeout, "How long to wait for the runtime components to be ready")
@@ -351,12 +351,6 @@ func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, opts *RuntimeInstall
351351
return err
352352
}
353353

354-
err = askUserIfToInstallDemoResources(cmd, &opts.InstallDemoResources)
355-
handleCliStep(reporter.InstallStepPreCheckShouldInstallDemoResources, "Asking user is demo resources should be installed", err, true, false)
356-
if err != nil {
357-
return err
358-
}
359-
360354
initializeGitSourceCloneOpts(opts)
361355

362356
opts.InsCloneOpts.Parse()
@@ -867,7 +861,7 @@ func createGitSources(ctx context.Context, opts *RuntimeInstallOptions) error {
867861
GitProvider: opts.gitProvider,
868862
GsName: store.Get().GitSourceName,
869863
RuntimeName: opts.RuntimeName,
870-
CreateDemoResources: opts.InstallDemoResources,
864+
CreateDemoResources: false,
871865
HostName: opts.HostName,
872866
SkipIngress: opts.SkipIngress,
873867
IngressHost: opts.IngressHost,

docs/releases/release_notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ cf version
2323

2424
```bash
2525
# download and extract the binary
26-
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.9/cf-linux-amd64.tar.gz | tar zx
26+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.10/cf-linux-amd64.tar.gz | tar zx
2727

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

3737
```bash
3838
# download and extract the binary
39-
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.9/cf-darwin-amd64.tar.gz | tar zx
39+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.10/cf-darwin-amd64.tar.gz | tar zx
4040

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

0 commit comments

Comments
 (0)