Skip to content

Commit 142276c

Browse files
CR-11473 adjusting installation flow to runtime recovery (#373)
* adjusting installation flow to runtime recovery * disable rollback in case of recovery * adjust to reporter * --from-repo flag added + adjustments * codegen * few fixes * adjust to recovery flag on ap * error handling * uncomment, bump version * bump autopilot
1 parent 6d847ba commit 142276c

File tree

8 files changed

+248
-67
lines changed

8 files changed

+248
-67
lines changed

Makefile

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

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

cmd/commands/runtime.go

Lines changed: 238 additions & 59 deletions
Large diffs are not rendered by default.

docs/commands/cli-v2_runtime_install.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ cli-v2 runtime install [runtime_name] [flags]
3232
--demo-resources Installs demo resources (default: true) (default true)
3333
--disable-rollback If true, will not perform installation rollback after a failed installation
3434
--disable-telemetry If true, will disable the analytics reporting for the installation process
35+
--from-repo Installs a runtime from an existing repo. Used for recovery after cluster failure
3536
-t, --git-token string Your git provider api token [GIT_TOKEN]
3637
-u, --git-user string Your git provider user name [GIT_USER] (not required in GitHub)
3738
-h, --help help for install

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.0.338/cf-linux-amd64.tar.gz | tar zx
26+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.339/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.0.338/cf-darwin-amd64.tar.gz | tar zx
39+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.339/cf-darwin-amd64.tar.gz | tar zx
4040

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

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
require (
66
github.com/Masterminds/semver/v3 v3.1.1
7-
github.com/argoproj-labs/argocd-autopilot v0.3.6
7+
github.com/argoproj-labs/argocd-autopilot v0.3.7
88
github.com/argoproj/applicationset v0.4.1
99
github.com/argoproj/argo-cd/v2 v2.3.3
1010
github.com/argoproj/argo-events v0.17.1-0.20220327045437-70eaafe9afec

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ github.com/antonmedv/expr v1.9.0/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmH
152152
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
153153
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
154154
github.com/appscode/go v0.0.0-20190808133642-1d4ef1f1c1e0/go.mod h1:iy07dV61Z7QQdCKJCIvUoDL21u6AIceRhZzyleh2ymc=
155-
github.com/argoproj-labs/argocd-autopilot v0.3.6 h1:7/1oq/YVCqPMPpGJ9zFK3GEI4G5tZFI5ZgqGf8YucsE=
156-
github.com/argoproj-labs/argocd-autopilot v0.3.6/go.mod h1:KFbmBBjYrK355/0iXYoLAbNt0TaomSlKrUWda+KVlAw=
155+
github.com/argoproj-labs/argocd-autopilot v0.3.7 h1:7GAWOvgWh93wTcoMHkafVwQTtZKDDokU7z+DUq0frvI=
156+
github.com/argoproj-labs/argocd-autopilot v0.3.7/go.mod h1:KFbmBBjYrK355/0iXYoLAbNt0TaomSlKrUWda+KVlAw=
157157
github.com/argoproj/applicationset v0.4.1 h1:PzTn77TK7XQB3CdpCDPbwU4pQgip0x4qvuJQ8XiBk5E=
158158
github.com/argoproj/applicationset v0.4.1/go.mod h1:cJZ7CWG80kBII4QNalyAvSr8eVifo8jKkyXoVl9qXaA=
159159
github.com/argoproj/argo-cd/v2 v2.3.3 h1:SE1Cb8MDqP5T2iUtyL9bwpKYIvpGkVUsgzKCAqZZ5Vc=

manifests/runtime.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
namespace: "{{ namespace }}"
66
spec:
77
defVersion: 1.0.1
8-
version: 0.0.338
8+
version: 0.0.339
99
bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
1010
components:
1111
- name: events

pkg/reporter/reporter.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ const (
8484
InstallStepCreateRuntimeOnPlatform CliStep = "install.run.step.create-runtime-on-platform"
8585
InstallStepBootstrapRepo CliStep = "install.run.step.bootstrap-repo"
8686
InstallStepCreateProject CliStep = "install.run.step.create-project"
87-
InstallStepCreateConfigMap CliStep = "install.run.step.create-codefresh-cm"
87+
InstallStepCreateOrUpdateConfigMap CliStep = "install.run.step.create-or-update-codefresh-cm"
88+
InstallStepApplySecretsToCluster CliStep = "install.run.step.apply-secrets-to-cluster"
8889
InstallStepCreateComponents CliStep = "install.run.step.create-components"
8990
InstallStepInstallComponenets CliStep = "install.run.step.install-components"
9091
InstallStepCreateGitsource CliStep = "install.run.step.create-gitsource"

0 commit comments

Comments
 (0)