diff --git a/Makefile b/Makefile index af7fa5e..5a376f1 100644 --- a/Makefile +++ b/Makefile @@ -33,11 +33,11 @@ run: generate fmt vet manifests go run ./main.go controller --store=bin/data # Install CRDs into a cluster -install: kubectl-bin manifests +install: bin/kubectl manifests kustomize build config/crd | $(KUBECTL) apply -f - # Deploy controller in the configured Kubernetes cluster in ~/.kube/config -deploy: kubectl-bin manifests +deploy: bin/kubectl manifests cd config/manager && kustomize edit set image controller=${IMG} kustomize build config/default | $(KUBECTL) apply -f - diff --git a/Vagrantfile b/Vagrantfile index 64206ce..e8b56d4 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -3,16 +3,20 @@ # based on: https://gist.github.com/avthart/08c5bbdc883ea8e0817141577b4f12fe $script = <<-SCRIPT +set -x apt-get update -apt-get install -y docker.io python python-pip -pip install docker-compose --upgrade -curl -s https://storage.googleapis.com/harbor-releases/release-1.8.0/harbor-online-installer-v1.8.2.tgz | tar zxv +apt-get install -y docker.io python3 python3-pip +pip3 install --upgrade pip +pip3 install docker-compose --upgrade +curl -sL https://github.com/goharbor/harbor/releases/download/v1.10.1/harbor-online-installer-v1.10.1.tgz | tar zxv cd harbor export IPADDR=`ifconfig enp0s8 | grep Mask | awk '{print $2}'| cut -f2 -d:` sed -i "s/^hostname: .*$/hostname: ${IPADDR}.xip.io/g" harbor.yml +sed -i.bak -e '12,18d' harbor.yml ./prepare ./install.sh +echo "access harbor here: http://${IPADDR}.xip.io." SCRIPT Vagrant.configure("2") do |config|