Skip to content

Commit

Permalink
fix: stop gc controller because k8s already handle it (#32)
Browse files Browse the repository at this point in the history
* fix: stop gc controller because k8s already handle it

* build: update version to v0.2.1
  • Loading branch information
Jun Zhang authored and caicloud-bot committed Apr 20, 2018
1 parent 3835430 commit 4e5ec2d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#

# Current version of the project.
VERSION ?= v0.1.4
VERSION ?= v0.2.1

# This repo's root import path (under GOPATH).
ROOT := github.com/caicloud/rudder
Expand All @@ -38,7 +38,7 @@ TARGETS := controller
# The final built images are:
# $[REGISTRY]/$[IMAGE_PREFIX]$[TARGET]$[IMAGE_SUFFIX]:$[VERSION]
# $[REGISTRY] is an item from $[REGISTRIES], $[TARGET] is an item from $[TARGETS].
IMAGE_PREFIX ?= $(strip rudder-)
IMAGE_PREFIX ?= $(strip release-)
IMAGE_SUFFIX ?= $(strip )

# Container registries.
Expand Down
5 changes: 3 additions & 2 deletions cmd/controller/app/controllers.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import (
)

// KnownControllers contains names of controllers
var KnownControllers = []string{"release-controller", "status-controller", "garbage-collector"}
// var KnownControllers = []string{"release-controller", "status-controller", "garbage-collector"}
var KnownControllers = []string{"release-controller", "status-controller"}

// InitFunc is used to launch a particular controller.
type InitFunc func(ctx ControllerContext) error
Expand All @@ -20,7 +21,7 @@ func NewControllerInitializers(availableControllers []string) (map[string]InitFu
allControllers := map[string]InitFunc{
"release-controller": startReleaseController,
"status-controller": startStatusController,
"garbage-collector": startGCController,
// "garbage-collector": startGCController,
}

result := make(map[string]InitFunc)
Expand Down

0 comments on commit 4e5ec2d

Please sign in to comment.