Reorganized code to accomodate removal of ip-reconciler binary

Signed-off-by: nicklesimba <[email protected]>
k8snetworkplumbingwg · May 30, 2022 · 8ef0d45 · 8ef0d45
1 parent 4ebc84f
commit 8ef0d45
Show file tree

Hide file tree

Showing 124 changed files with 1,529 additions and 5,477 deletions.
diff --git a/cmd/controlloop/main.go → cmd/controlloop/controlloop.go b/cmd/controlloop/main.go → cmd/controlloop/controlloop.go
diff --git a/go.mod b/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/onsi/ginkgo v1.14.1
 	github.com/onsi/gomega v1.10.2
 	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_golang v1.7.1
 	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
 	golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
 	golang.org/x/tools v0.1.9 // indirect

diff --git a/hack/build-go.sh b/hack/build-go.sh
@@ -45,5 +45,4 @@ VERSION_LDFLAGS="-X github.com/k8snetworkplumbingwg/whereabouts/pkg/version.Vers
 GLDFLAGS="${GLDFLAGS} ${VERSION_LDFLAGS}"
 
 CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} ${GO} build ${GOFLAGS} -ldflags "${GLDFLAGS}" -o bin/${cmd} cmd/${cmd}.go
-CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} ${GO} build ${GOFLAGS} -ldflags "${GLDFLAGS}" -o bin/ip-reconciler cmd/reconciler/*.go
 CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} ${GO} build ${GOFLAGS} -ldflags "${GLDFLAGS}" -o bin/ip-control-loop cmd/controlloop/*.go
diff --git a/...econciler/controlloop/dummy_controller.go → pkg/controlloop/dummy_controller.go b/...econciler/controlloop/dummy_controller.go → pkg/controlloop/dummy_controller.go
diff --git a/...conciler/controlloop/entity_generators.go → pkg/controlloop/entity_generators.go b/...conciler/controlloop/entity_generators.go → pkg/controlloop/entity_generators.go
diff --git a/pkg/reconciler/controlloop/pod.go → pkg/controlloop/pod.go b/pkg/reconciler/controlloop/pod.go → pkg/controlloop/pod.go
diff --git a/...nciler/controlloop/pod_controller_test.go → pkg/controlloop/pod_controller_test.go b/...nciler/controlloop/pod_controller_test.go → pkg/controlloop/pod_controller_test.go
diff --git a/cmd/reconciler/errors.go → pkg/reconciler/errors.go b/cmd/reconciler/errors.go → pkg/reconciler/errors.go
@@ -1,4 +1,4 @@
-package main
+package reconciler
 
 const (
 	kubeconfigNotFound = iota + 1

diff --git a/cmd/reconciler/ip.go → pkg/reconciler/ip.go b/cmd/reconciler/ip.go → pkg/reconciler/ip.go
@@ -1,4 +1,4 @@
-package main
+package reconciler
 
 import (
 	"context"

diff --git a/cmd/reconciler/ip_test.go → pkg/reconciler/ip_test.go b/cmd/reconciler/ip_test.go → pkg/reconciler/ip_test.go
@@ -1,4 +1,4 @@
-package main
+package reconciler
 
 import (
 	"context"

diff --git a/cmd/reconciler/suite_test.go → pkg/reconciler/suite_test.go b/cmd/reconciler/suite_test.go → pkg/reconciler/suite_test.go
@@ -1,4 +1,4 @@
-package main
+package reconciler
 
 import (
 	"encoding/base64"

diff --git a/vendor/github.com/cespare/xxhash/v2/.travis.yml b/vendor/github.com/cespare/xxhash/v2/.travis.yml
diff --git a/vendor/github.com/cespare/xxhash/v2/README.md b/vendor/github.com/cespare/xxhash/v2/README.md
diff --git a/vendor/github.com/cespare/xxhash/v2/xxhash.go b/vendor/github.com/cespare/xxhash/v2/xxhash.go
diff --git a/vendor/github.com/cespare/xxhash/v2/xxhash_amd64.s b/vendor/github.com/cespare/xxhash/v2/xxhash_amd64.s
diff --git a/vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go b/vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/README.md b/vendor/github.com/prometheus/client_golang/prometheus/README.md
diff --git a/...r/github.com/prometheus/procfs/cmdline.go → ...us/client_golang/prometheus/build_info.go b/...r/github.com/prometheus/procfs/cmdline.go → ...us/client_golang/prometheus/build_info.go