Merge pull request #18 from ibuildthecloud/master

More build fixes
rancher · May 8, 2020 · 880410a · 880410a
2 parents ce16c4a + a9c37fd
commit 880410a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && \
 RUN cp -f /etc/skel/.bashrc /etc/skel/.profile /root/ && \
     echo 'alias abort="echo -e '\''q\ny\n'\'' | ./bin/dlv connect :2345"' >> /root/.bashrc
 ENV PATH=/var/lib/rancher/rke2/bin:$PATH
-ENV KUBECONFIG=/etc/rancher/k3s/k3s.yaml
+ENV KUBECONFIG=/etc/rancher/rke2/rke2.yaml
 VOLUME /var/lib/rancher/rke2
 # This makes it so we can run and debug k3s too
 VOLUME /var/lib/rancher/k3s

diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ endif
 ifdef DRONE_TAG
 	VERSION=${DRONE_TAG}
 else
-	VERSION?=$(shell git describe --match 'v[0-9]*' --dirty='.dirty' --always --tags)
+	VERSION=dev
 endif
 REVISION=$(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .dirty; fi)
 RELEASE=${PROG}-$(VERSION).${GOOS}-${GOARCH}

diff --git a/go.mod b/go.mod
@@ -32,7 +32,7 @@ replace (
 	github.com/prometheus/client_model => github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910
 	github.com/prometheus/common => github.com/prometheus/common v0.0.0-20181126121408-4724e9255275
 	github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a
-	github.com/rancher/k3s => github.com/ibuildthecloud/k3s-dev v0.1.0-rc6.0.20200507231729-5cf25b189e0e
+	github.com/rancher/k3s => github.com/ibuildthecloud/k3s-dev v0.1.0-rc6.0.20200508172341-d560cca31b9e
 	k8s.io/api => github.com/rancher/kubernetes/staging/src/k8s.io/api v1.18.2-k3s.1
 	k8s.io/apiextensions-apiserver => github.com/rancher/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.2-k3s.1
 	k8s.io/apimachinery => github.com/rancher/kubernetes/staging/src/k8s.io/apimachinery v1.18.2-k3s.1

diff --git a/go.sum b/go.sum
@@ -427,8 +427,8 @@ github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible/go.mo
 github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ibuildthecloud/k3s-dev v0.1.0-rc6.0.20200507231729-5cf25b189e0e h1:p9up77xlMMPyweLX+89hCJ1eSXyrbO7uusC6XMb5q/U=
-github.com/ibuildthecloud/k3s-dev v0.1.0-rc6.0.20200507231729-5cf25b189e0e/go.mod h1:/5+T1vYOwutUBKv8eJ6HNIfSk1HdCQ6dlFIg9klx8UU=
+github.com/ibuildthecloud/k3s-dev v0.1.0-rc6.0.20200508172341-d560cca31b9e h1:UxxGmKCDFzsUsYoSEB3Q+5/Q1kCV4q8WCJu4AJCZqlM=
+github.com/ibuildthecloud/k3s-dev v0.1.0-rc6.0.20200508172341-d560cca31b9e/go.mod h1:/5+T1vYOwutUBKv8eJ6HNIfSk1HdCQ6dlFIg9klx8UU=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
 github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=

diff --git a/pkg/images/images.go b/pkg/images/images.go
@@ -39,7 +39,7 @@ func override(str, override string) string {
 func New(repo string) Images {
 	return Images{
 		KubeAPIServer:       override(override("k8s.gcr.io", repo)+"/kube-apiserver:"+KubernetesVersion, apiServer),
-		KubeControllManager: override(override("k8s.gcr.io", repo)+"/kube-controller-maanger:"+KubernetesVersion, controllerManager),
+		KubeControllManager: override(override("k8s.gcr.io", repo)+"/kube-controller-manager:"+KubernetesVersion, controllerManager),
 		KubeScheduler:       override(override("k8s.gcr.io", repo)+"/kube-scheduler:"+KubernetesVersion, scheduler),
 		Pause:               override(override("k8s.gcr.io", repo)+"/pause:"+PauseVersion, pause),
 		Runtime:             override(override("rancher", repo)+"/rke2-runtime:"+version.Version, runtime),