Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove automatic helm upgrade #13

Merged
merged 2 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions laptop/helm-upgrade.sh

This file was deleted.

12 changes: 6 additions & 6 deletions laptop/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ helm_install_tink_stack() {
--create-namespace \
--namespace "$namespace" \
--wait \
--set "smee.trustedProxies=${trusted_proxies}" \
--set "hegel.trustedProxies=${trusted_proxies}" \
--set "stack.kubevip.interface=${interface}" \
--values manifests/proxy-values.yaml \
--set "stack.loadBalancerIP=${loadbalancer_ip}" \
--set "smee.publicIP=${loadbalancer_ip}"
--values manifests/proxy-values.yaml

kubectl -n tink-system patch clusterrole smee-role --type='json' -p='[
{"op": "add", "path": "/rules/0/verbs/-", "value": "create"},
{"op": "add", "path": "/rules/0/verbs/-", "value": "update"}
]'
}

configure_dnsmasq() {
Expand Down
4 changes: 2 additions & 2 deletions virtual-datacenter/scripts/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ curl -sLO https://github.com/konstructio/colony/releases/download/${COLONY_CLI_V
export COLONY_API_KEY=$COLONY_API_KEY; \
sudo install -m 0755 ./colony /usr/local/bin/; \
sudo kubectl -n tink-system get secret mgmt-kubeconfig; \
/home/vagrant/manifests/helm-upgrade.sh /home/vagrant/manifests/proxy-values.yaml; \
echo '------------------------------------'; \
echo 'kubens tink-system'; \
echo 'kubens tink-system' >> ~/.bashrc; \
Expand All @@ -62,12 +61,13 @@ echo '------------------------------------'; \
sshCommand=$(civo_get_ssh_command)

echo -e "${YELLOW}$sshCommand ${NOCOLOR}"
local branch="main"

local fullCommand="$sshCommand -tt 'vagrant plugin list | grep -q vagrant-libvirt || vagrant plugin install vagrant-libvirt; \
curl -sLO https://github.com/konstructio/colony/releases/download/${COLONY_CLI_VERSION}/colony_Linux_x86_64.tar.gz && tar -xvf colony_Linux_x86_64.tar.gz; \
sudo install -m 0755 ./colony /usr/local/bin/; \
sudo systemctl restart libvirtd; \
git clone https://github.com/konstructio/colony-vagrant.git colony-vagrant; \
git clone -b $branch https://github.com/konstructio/colony-vagrant.git colony-vagrant; \
cd colony-vagrant; vagrant up spine01 leaf01 exit laptop; vagrant ssh laptop -c \"$vagrantCommand\"; \
vagrant ssh laptop; exec /bin/bash -i'"

Expand Down