From 6e2ed7c6cc01728ff45f91e96a326472ccb4c11e Mon Sep 17 00:00:00 2001 From: Eugenio Marzo Date: Sat, 27 Mar 2021 16:12:14 +0100 Subject: [PATCH] change helm chart --- .gitignore | 2 + Vagrantfile | 64 ++++++++++++++--------------- helm-charts/README.md | 5 --- helm-charts/kubeinvaders/Chart.yaml | 2 +- helm-charts/kubeinvaders/README.md | 22 ++++++++++ helm-charts/kubeinvaders/index.yaml | 3 -- push.sh | 2 - push_dev.sh | 2 - push_prod.sh | 4 -- 9 files changed, 56 insertions(+), 50 deletions(-) delete mode 100644 helm-charts/README.md create mode 100644 helm-charts/kubeinvaders/README.md delete mode 100755 helm-charts/kubeinvaders/index.yaml delete mode 100644 push.sh delete mode 100644 push_dev.sh delete mode 100644 push_prod.sh diff --git a/.gitignore b/.gitignore index 9d39a03..b3d0159 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +utils +.vagrant x86_64-darwin.zip x86_64-linux.zip pack.sh diff --git a/Vagrantfile b/Vagrantfile index 2e8b8fc..c151d97 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,40 +5,38 @@ # configures the configuration version (we support older styles for # backwards compatibility). Please don't change it unless you know what # you're doing. -Vagrant.configure("2") do |config| - - $script = <<-SCRIPT - helm_url=https://get.helm.sh/helm-v3.5.3-linux-amd64.tar.gz - which k3s || curl -sfL https://get.k3s.io | sh - - which helm || (curl -o /home/vagrant/$(basename $helm_url) $helm_url -L --silent && \ - tar -xvf helm-v3.5.3-linux-amd64.tar.gz && \ - sudo cp /home/vagrant/linux-amd64/helm /usr/local/bin/ && \ - sudo chmod 775 /usr/local/bin/helm) - helm list &> /dev/null || sudo chown vagrant:root /etc/rancher/k3s/k3s.yaml - export KUBECONFIG=/etc/rancher/k3s/k3s.yaml - kubectl get pods -l app.kubernetes.io/name=ingress-nginx | grep nginx &> /dev/null - if [ "$?" -ne 0 ];then - helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx - helm repo update - helm install ingress-nginx ingress-nginx/ingress-nginx - fi - kubectl get namespaces | grep kubeinvaders || kubectl create namespace kubeinvaders +Vagrant.configure('2') do |config| - SCRIPT + config.vm.network 'forwarded_port', guest: 80, host: 8080, host_ip: '127.0.0.1' + + $script = <<-SCRIPT + helm_url=https://get.helm.sh/helm-v3.5.3-linux-amd64.tar.gz + which k3s || curl -sfL https://get.k3s.io | sh - + which helm || (curl -o /home/vagrant/$(basename $helm_url) $helm_url -L --silent && \ + tar -xvf helm-v3.5.3-linux-amd64.tar.gz && \ + sudo cp /home/vagrant/linux-amd64/helm /usr/local/bin/ && \ + sudo chmod 775 /usr/local/bin/helm) + helm list &> /dev/null || sudo chown vagrant:root /etc/rancher/k3s/k3s.yaml + export KUBECONFIG=/etc/rancher/k3s/k3s.yaml + kubectl get pods -l app.kubernetes.io/name=ingress-nginx | grep nginx &> /dev/null + if [ "$?" -ne 0 ];then + helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx + helm repo update + helm install ingress-nginx ingress-nginx/ingress-nginx + fi + kubectl get namespaces | grep kubeinvaders || kubectl create namespace kubeinvaders + SCRIPT - config.vm.provision "shell", - inline: $script - - config.vm.post_up_message = "\n\nEnjoy KubeInvaders!\n\n" - - config.vm.define "kubeinvaders01" do |rke| - rke.vm.box = 'ubuntu/focal64' - rke.vm.hostname = 'kubeinvaders01' - rke.vm.network "private_network", ip: "192.168.58.2" - rke.vm.provider :virtualbox do |vb| - vb.memory = 4096 - vb.cpus = 2 - end + config.vm.provision 'shell', inline: $script + + config.vm.post_up_message = '\n\nEnjoy KubeInvaders!\n\n' + + config.vm.define 'kubeinvaders01' do |rke| + rke.vm.box = 'ubuntu/focal64' + rke.vm.hostname = 'kubeinvaders01' + rke.vm.provider :virtualbox do |vb| + vb.memory = 4096 + vb.cpus = 2 end - end +end diff --git a/helm-charts/README.md b/helm-charts/README.md deleted file mode 100644 index a2ba1da..0000000 --- a/helm-charts/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Helm Chart Repository for - -* [kubeinvaders](https://github.com/lucky-sideburn/KubeInvaders) - -Contributions from kubeinvaders to KubeInvaders are welcome! diff --git a/helm-charts/kubeinvaders/Chart.yaml b/helm-charts/kubeinvaders/Chart.yaml index b254ba1..04b0338 100644 --- a/helm-charts/kubeinvaders/Chart.yaml +++ b/helm-charts/kubeinvaders/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: A Helm chart for KubeInvaders name: kubeinvaders appVersion: 1.0 -version: 1.0 +version: 1.2 home: https://github.com/lucky-sideburn/KubeInvaders sources: diff --git a/helm-charts/kubeinvaders/README.md b/helm-charts/kubeinvaders/README.md new file mode 100644 index 0000000..33bb825 --- /dev/null +++ b/helm-charts/kubeinvaders/README.md @@ -0,0 +1,22 @@ +# KubeInvaders Helm Chart Repository + +## Usage + +```bash +helm repo add kubeinvaders https://lucky-sideburn.github.io/helm-charts/ + +kubectl create namespace kubeinvaders + +# Install new and full open-source version +helm install kubeinvaders --set-string target_namespace="namespace1\,namespace2" \ +--namespace kubeinvaders ./helm-charts/kubeinvaders \ +--set ingress.hostName=kubeinvaders.io --set image.tag=v1.0 +``` + +## Helm Values + +| Variable | Description | +| ------------------- | -------------------------------------- | +| image.tag | Specify tag of KubeInvaders to deploy | +| ingress.hostName | URL used for ingress | +| target_namespace | namespaces to take under control | diff --git a/helm-charts/kubeinvaders/index.yaml b/helm-charts/kubeinvaders/index.yaml deleted file mode 100755 index f44cc7f..0000000 --- a/helm-charts/kubeinvaders/index.yaml +++ /dev/null @@ -1,3 +0,0 @@ -apiVersion: v1 -entries: {} -generated: 2020-01-04T08:53:44.106913+01:00 diff --git a/push.sh b/push.sh deleted file mode 100644 index 4bd76cb..0000000 --- a/push.sh +++ /dev/null @@ -1,2 +0,0 @@ -docker build . -t docker.io/luckysideburn/kubeinvaders:dev-purejs -docker push docker.io/luckysideburn/kubeinvaders:dev-purejs diff --git a/push_dev.sh b/push_dev.sh deleted file mode 100644 index 4bd76cb..0000000 --- a/push_dev.sh +++ /dev/null @@ -1,2 +0,0 @@ -docker build . -t docker.io/luckysideburn/kubeinvaders:dev-purejs -docker push docker.io/luckysideburn/kubeinvaders:dev-purejs diff --git a/push_prod.sh b/push_prod.sh deleted file mode 100644 index 3bfe3e3..0000000 --- a/push_prod.sh +++ /dev/null @@ -1,4 +0,0 @@ -docker build . -t docker.io/luckysideburn/kubeinvaders:purejs -docker push docker.io/luckysideburn/kubeinvaders:purejs -docker tag docker.io/luckysideburn/kubeinvaders:purejs docker.io/luckysideburn/kubeinvaders:latest -docker push docker.io/luckysideburn/kubeinvaders:latest