Skip to content

Commit

Permalink
update and fix novm bug
Browse files Browse the repository at this point in the history
Signed-off-by: Adam Crowder <adam@adamcrowder.net>
  • Loading branch information
cheeseandcereal committed Feb 13, 2020
1 parent 03d84cb commit 6500c8a
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.6.3
v0.6.4
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## v0.6.4

- **Bugs:**
- Fix bug when not using a VM on linux to properly configure kubectl config environment for the proper user
- **Packaging:**
- Update default version of kubernetes to 1.15.10
- Update default installed minikube to 1.7.2
- Update default installed helm to 3.1.0
- Update default installed kubectl to v1.17.3
- Use openfaas chart version 5.5.4 (openfaas 0.18.10, faas-netes 0.10.1)

## v0.6.3

- **Packaging:**
Expand Down
28 changes: 14 additions & 14 deletions internal/configuration/variables.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var Version string
var DragonchainHelmVersion = "1.0.8"

// OpenfaasHelmVersion helm version of openfaas (faas-netes) to use
var OpenfaasHelmVersion = "5.5.1"
var OpenfaasHelmVersion = "5.5.4"

// RegistryHelmVersion helm version of docker container registry to use
var RegistryHelmVersion = "1.9.1"
Expand All @@ -22,7 +22,7 @@ var RegistryPort = 5000
var MinikubeContext = "dragonchain"

// KubernetesVersion the kubernetes version to use with the dragonchain's minikube cluster
var KubernetesVersion = "v1.15.9"
var KubernetesVersion = "v1.15.10"

// MinikubeVMMemory amount of memory to give to the minikube VM (only applicable when creating new minikube cluster)
var MinikubeVMMemory = "4000mb"
Expand All @@ -40,40 +40,40 @@ var MacosVirtualboxLink = "https://download.virtualbox.org/virtualbox/6.1.2/Virt
var WindowsVirtualboxLink = "https://download.virtualbox.org/virtualbox/6.1.2/VirtualBox-6.1.2-135663-Win.exe"

// LinuxMinikubeArm64Link direct link for minikube aarch64 executable
var LinuxMinikubeArm64Link = "https://storage.googleapis.com/minikube/releases/v1.7.0/minikube-linux-arm64"
var LinuxMinikubeArm64Link = "https://storage.googleapis.com/minikube/releases/v1.7.2/minikube-linux-arm64"

// LinuxMinikubeLink direct link for linux minikube executable
var LinuxMinikubeLink = "https://storage.googleapis.com/minikube/releases/v1.7.0/minikube-linux-amd64"
var LinuxMinikubeLink = "https://storage.googleapis.com/minikube/releases/v1.7.2/minikube-linux-amd64"

// MacosMinikubeLink direct link for macos minikube executable
var MacosMinikubeLink = "https://storage.googleapis.com/minikube/releases/v1.7.0/minikube-darwin-amd64"
var MacosMinikubeLink = "https://storage.googleapis.com/minikube/releases/v1.7.2/minikube-darwin-amd64"

// WindowsMinikubeLink direct link for windows minikube executable
var WindowsMinikubeLink = "https://storage.googleapis.com/minikube/releases/v1.7.0/minikube-windows-amd64.exe"
var WindowsMinikubeLink = "https://storage.googleapis.com/minikube/releases/v1.7.2/minikube-windows-amd64.exe"

// LinuxHelmLink direct link for linux helm package
var LinuxHelmLink = "https://get.helm.sh/helm-v3.0.3-linux-amd64.tar.gz"
var LinuxHelmLink = "https://get.helm.sh/helm-v3.1.0-linux-amd64.tar.gz"

// LinuxHelmArm64Link direct link for linux arm64 helm package
var LinuxHelmArm64Link = "https://get.helm.sh/helm-v3.0.3-linux-arm64.tar.gz"
var LinuxHelmArm64Link = "https://get.helm.sh/helm-v3.1.0-linux-arm64.tar.gz"

// MacosHelmLink direct link for macos helm package
var MacosHelmLink = "https://get.helm.sh/helm-v3.0.3-darwin-amd64.tar.gz"
var MacosHelmLink = "https://get.helm.sh/helm-v3.1.0-darwin-amd64.tar.gz"

// WindowsHelmLink direct link for windows helm package
var WindowsHelmLink = "https://get.helm.sh/helm-v3.0.3-windows-amd64.zip"
var WindowsHelmLink = "https://get.helm.sh/helm-v3.1.0-windows-amd64.zip"

// LinuxKubectlLink direct link for linux kubectl executable
var LinuxKubectlLink = "https://storage.googleapis.com/kubernetes-release/release/v1.17.2/bin/linux/amd64/kubectl"
var LinuxKubectlLink = "https://storage.googleapis.com/kubernetes-release/release/v1.17.3/bin/linux/amd64/kubectl"

// LinuxKubectlArm64Link directl link for linux arm64 kubectl executable
var LinuxKubectlArm64Link = "https://storage.googleapis.com/kubernetes-release/release/v1.17.2/bin/linux/arm64/kubectl"
var LinuxKubectlArm64Link = "https://storage.googleapis.com/kubernetes-release/release/v1.17.3/bin/linux/arm64/kubectl"

// MacosKubectlLink direct link for macos kubectl executable
var MacosKubectlLink = "https://storage.googleapis.com/kubernetes-release/release/v1.17.2/bin/darwin/amd64/kubectl"
var MacosKubectlLink = "https://storage.googleapis.com/kubernetes-release/release/v1.17.3/bin/darwin/amd64/kubectl"

// WindowsKubectlLink direct link for windows kubectl executable
var WindowsKubectlLink = "https://storage.googleapis.com/kubernetes-release/release/v1.17.2/bin/windows/amd64/kubectl.exe"
var WindowsKubectlLink = "https://storage.googleapis.com/kubernetes-release/release/v1.17.3/bin/windows/amd64/kubectl.exe"

// SetDefaultCredentials indicates whether or not to set the default chain whe configuring the credentials ini file
var SetDefaultCredentials = true
2 changes: 1 addition & 1 deletion internal/minikube/configure.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func StartMinikubeCluster(useVM bool) error {
var minikubeStartCmd *exec.Cmd
if !useVM {
fmt.Println("\nStarting minikube cluster; This can take a while")
minikubeStartCmd = exec.Command("sudo", "minikube", "start", "--kubernetes-version="+configuration.KubernetesVersion, "--vm-driver=none")
minikubeStartCmd = exec.Command("sudo", "-E", "minikube", "start", "--kubernetes-version="+configuration.KubernetesVersion, "--vm-driver=none")
configuration.MinikubeContext = "minikube"
} else {
if exists {
Expand Down
2 changes: 1 addition & 1 deletion scripts/get_installer.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e

# Default version (change with new tagged releases)
VERSION="v0.6.3"
VERSION="v0.6.4"

if [ -z "$HOME" ]; then
echo "The \$HOME environment variable must be present"
Expand Down

0 comments on commit 6500c8a

Please sign in to comment.