Skip to content

ref(glide): use k8s.io/client-go #509

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.

Sign up for GitHub

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

Open
bacongobbler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ref(glide): use k8s.io/client-go #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 14 additions & 5 deletions boot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import (
_ "github.com/docker/distribution/registry/storage/driver/s3-aws"
_ "github.com/docker/distribution/registry/storage/driver/swift"
"github.com/kelseyhightower/envconfig"
kcl "k8s.io/kubernetes/pkg/client/unversioned"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
)

const (
Expand Down Expand Up @@ -74,22 +76,29 @@ func main() {
os.Exit(1)
}

kubeClient, err := kcl.NewInCluster()
// creates the in-cluster config
config, err := rest.InClusterConfig()
if err != nil {
log.Printf("Error getting kubernetes client [%s]", err)
log.Printf("Error getting kubernetes in-cluster config (%s)", err)
os.Exit(1)
}
// creates the clientset
clientset, err := kubernetes.NewForConfig(config)
if err != nil {
log.Printf("Error getting kubernetes client (%s)", err)
os.Exit(1)
}
log.Printf("Starting health check server on port %d", cnf.HealthSrvPort)
healthSrvCh := make(chan error)
go func() {
if err := healthsrv.Start(cnf, kubeClient.Namespaces(), storageDriver, circ); err != nil {
if err := healthsrv.Start(cnf, clientset.CoreV1.Namespaces().List(metav1.ListOptions{}), storageDriver, circ); err != nil {
healthSrvCh <- err
}
}()
log.Printf("Starting deleted app cleaner")
cleanerErrCh := make(chan error)
go func() {
if err := cleaner.Run(gitHomeDir, kubeClient.Namespaces(), fs, cnf.CleanerPollSleepDuration(), storageDriver); err != nil {
if err := cleaner.Run(gitHomeDir, clientset.CoreV1.Namespaces().List(metav1.ListOptions{}), fs, cnf.CleanerPollSleepDuration(), storageDriver); err != nil {
cleanerErrCh <- err
}
}()
Expand Down
208 changes: 182 additions & 26 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading