Skip to content

Commit

Permalink
Release 1.2.0-rc2 (#122)
Browse files Browse the repository at this point in the history
* Release 1.2.0-rc2
  • Loading branch information
suleymanakbas91 authored Jun 13, 2019
1 parent c357698 commit 428306a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ before:
builds:
- env:
- CGO_ENABLED=0
- KYMA_VERSION=1.2.0-rc1
- KYMA_VERSION=1.2.0-rc2
ldflags: -X github.com/kyma-project/cli/pkg/kyma/cmd.Version={{.Version}} -X github.com/kyma-project/cli/pkg/kyma/cmd/install.DefaultKymaVersion={{.Env.KYMA_VERSION}}
main: ./cmd/kyma/
archives:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.DEFAULT_GOAL := local

KYMA_VERSION = 1.2.0-rc1
KYMA_VERSION = 1.2.0-rc2

ifndef VERSION
VERSION = ${shell git describe --tags --always}
Expand Down
15 changes: 13 additions & 2 deletions pkg/kyma/cmd/install/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -879,13 +879,24 @@ func (cmd *command) releaseFile(path string) string {
func (cmd *command) patchMinikubeIP() error {
minikubeIP, err := minikube.RunCmd(cmd.opts.Verbose, "ip")
if err != nil {
return err
cmd.CurrentStep.LogInfo("unable to perform 'minikube ip' command. Patches won't be applied")
return nil
}
minikubeIP = strings.TrimSpace(minikubeIP)

for k, v := range patchMap {
for _, pData := range v {
_, err := cmd.Kubectl().RunCmd("-n", "kyma-installer", "patch", k, "--type=json",
if _, err := cmd.Kubectl().RunCmd("-n", "kyma-installer", "get", k); err != nil {
if strings.Contains(err.Error(), "not found") {
cmd.CurrentStep.LogInfof("resource '%s' not found, won't be patched", k)
continue
} else {
return err
}
}

_, err = cmd.Kubectl().RunCmd("-n", "kyma-installer", "patch", k, "--type=json",
"--allow-missing-template-keys=true",
fmt.Sprintf("--patch=[{'op': 'replace', 'path': '/data/%s', 'value': '%s'}]", pData, minikubeIP))
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion pkg/kyma/cmd/provision/minikube/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func (c *command) checkRequirements(s step.Step) error {
return fmt.Errorf("Specified VMDriver '%s' requires the --hypervVirtualSwitch option", vmDriverHyperv)
}

versionWarning, err := minikube.CheckVersion(true)
versionWarning, err := minikube.CheckVersion(c.opts.Verbose)
if err != nil {
s.Failure()
return err
Expand Down

0 comments on commit 428306a

Please sign in to comment.