use operator-sdk framework

.gitignore

@@ -337,3 +337,6 @@ apiserver.local.config/
 config
 *.cert
 *.key
+
+# VSCode specific files
+.vscode

Makefile

@@ -1,13 +1,17 @@
 ##################################################
 # Variables                                      #
 ##################################################
-ARCH?=amd64
-CGO?=0
-TARGET_OS?=linux
+IMAGE_TAG      ?= 0.0.4
+IMAGE_REGISTRY ?= docker.io
+IMAGE_REPO     ?= kedacore
 
-##################################################
-# Variables                                      #
-##################################################
+IMAGE_CONTROLLER = $(IMAGE_REGISTRY)/$(IMAGE_REPO)/keda:$(IMAGE_TAG)
+IMAGE_ADAPTER    = $(IMAGE_REGISTRY)/$(IMAGE_REPO)/keda-metrics-adapter:$(IMAGE_TAG)
+
+
+ARCH       ?=amd64
+CGO        ?=0
+TARGET_OS  ?=linux
 
 GIT_VERSION = $(shell git describe --always --abbrev=7)
 GIT_COMMIT  = $(shell git rev-list -1 HEAD)
@@ -38,31 +42,46 @@ e2e-test:
 	npm install --prefix tests
 	npm test --verbose --prefix tests
 
+##################################################
+# PUBLISH                                        #
+##################################################
+.PHONY: publish
+publish: build
+	docker push $(IMAGE_ADAPTER)
+	docker push $(IMAGE_CONTROLLER)
+
 ##################################################
 # Build                                          #
 ##################################################
-GENERATED  = $(shell find pkg/client -type f)
+GO_BUILD_VARS= GO111MODULE=on CGO_ENABLED=$(CGO) GOOS=$(TARGET_OS) GOARCH=$(ARCH)
 
 .PHONY: build
-build: pkg/scalers/liiklus/LiiklusService.pb.go
-	GO111MODULE=on CGO_ENABLED=$(CGO) GOOS=$(TARGET_OS) GOARCH=$(ARCH) go build \
-		-ldflags "-X main.GitCommit=$(GIT_COMMIT)" \
-		-o dist/keda \
-		cmd/main.go
+build: build-adapter build-controller
+
+.PHONY: build-controller
+build-controller: generate-api pkg/scalers/liiklus/LiiklusService.pb.go
+	$(GO_BUILD_VARS) operator-sdk build $(IMAGE_CONTROLLER) \
+		--go-build-args "-ldflags -X=main.GitCommit=$(GIT_COMMIT)"
+
+.PHONY: build-adapter 
+build-adapter: generate-api pkg/scalers/liiklus/LiiklusService.pb.go
+	$(GO_BUILD_VARS) go build \
+		-ldflags "-X=main.GitCommit=$(GIT_COMMIT)" \
+		-o build/_output/bin/keda-adapter \
+		cmd/adapter/main.go 
+	docker build -f build/Dockerfile.adapter -t $(IMAGE_ADAPTER) . 
+
+.PHONY: generate-api
+generate-api: 
+	$(GO_BUILD_VARS) operator-sdk generate k8s
+	$(GO_BUILD_VARS) operator-sdk generate openapi
 
 pkg/scalers/liiklus/LiiklusService.pb.go: hack/LiiklusService.proto
 	protoc -I hack/ hack/LiiklusService.proto --go_out=plugins=grpc:pkg/scalers/liiklus
 
 pkg/scalers/liiklus/mocks/mock_liiklus.go: pkg/scalers/liiklus/LiiklusService.pb.go
 	mockgen github.com/kedacore/keda/pkg/scalers/liiklus LiiklusServiceClient > pkg/scalers/liiklus/mocks/mock_liiklus.go
 
-APIS_FILES = $(shell find pkg/apis -type f)
-GEN_SCRIPT = $(shell find hack/ -type f)
-
-.PHONY: codegen
-$(GENERATED) codegen: $(APIS_FILES) $(GEN_SCRIPT)
-	hack/generate-groups.sh
-
 ##################################################
 # Helm Chart tasks                               #
 ##################################################

README.md

@@ -65,9 +65,11 @@ func kubernetes install --namespace keda
 ```
 
 ### Deploying using the deploy yaml
-If you want to try KEDA on minikube or a different Kubernetes deployment without using Helm, you can deploy the yaml under the `/deploy` directory.
+If you want to try KEDA on minikube or a different Kubernetes deployment without using Helm, you can deploy CRD and yamls under the `/deploy` directory.
 ```
-kubectl apply -f KedaScaleController.yaml
+kubectl apply -f deploy/crds/keda.k8s.io_scaledobjects_crd.yaml
+kubectl apply -f deploy/crds/keda.k8s.io_triggerauthentications_crd.yaml
+kubectl apply -f deploy/
 ```
 
 ## How KEDA works
@@ -130,12 +132,12 @@ Zoom link: [https://zoom.us/j/150360492 ](https://zoom.us/j/150360492 )
 Meeting agenda: [https://hackmd.io/s/r127ErYiN](https://hackmd.io/s/r127ErYiN)
 
 ## Building
+This project is using [Operator SDK framework](https://github.com/operator-framework/operator-sdk) v0.11.0.
 
 ```bash
 git clone git@github.com:kedacore/keda.git
 cd keda
 make build
-./dist/keda
 ```
 
 # Contributing

build/Dockerfile

@@ -0,0 +1,15 @@
+FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+
+ENV OPERATOR=/usr/local/bin/keda \
+    USER_UID=1001 \
+    USER_NAME=keda
+
+# install operator binary
+COPY build/_output/bin/keda ${OPERATOR}
+
+COPY build/bin /usr/local/bin
+RUN  /usr/local/bin/user_setup
+
+ENTRYPOINT ["/usr/local/bin/entrypoint"]
+
+USER ${USER_UID}

build/Dockerfile.adapter

@@ -0,0 +1,19 @@
+FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+
+ENV OPERATOR=/usr/local/bin/keda-adapter \
+    USER_UID=1001 \
+    USER_NAME=keda
+
+COPY build/_output/bin/keda-adapter ${OPERATOR} 
+
+COPY build/bin /usr/local/bin
+RUN /usr/local/bin/user_setup && \
+    mkdir /adapter && \
+    chmod 777 /adapter && \
+    chmod +x ${OPERATOR}
+
+WORKDIR /adapter
+
+ENTRYPOINT ["/usr/local/bin/entrypoint", "--secure-port=6443", "--logtostderr=true", "--v=0"]
+
+USER ${USER_UID}

cmd/adapter/main.go

@@ -0,0 +1,89 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/kedacore/keda/pkg/handler"
+	kedaprovider "github.com/kedacore/keda/pkg/provider"
+
+	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/klog"
+	"k8s.io/klog/klogr"
+
+	kedav1alpha1 "github.com/kedacore/keda/pkg/apis/keda/v1alpha1"
+	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
+	appsv1 "k8s.io/api/apps/v1"
+	"k8s.io/client-go/kubernetes/scheme"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/config"
+
+	basecmd "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/cmd"
+	"github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider"
+)
+
+// Adapter creates External Metrics Provider
+type Adapter struct {
+	basecmd.AdapterBase
+
+	// Message is printed on succesful startup
+	Message string
+}
+
+var logger = klogr.New().WithName("keda_metrics_adapter")
+
+func (a *Adapter) makeProviderOrDie() provider.MetricsProvider {
+
+	// Get a config to talk to the apiserver
+	cfg, err := config.GetConfig()
+	if err != nil {
+		logger.Error(err, "failed to get the config")
+		os.Exit(1)
+	}
+
+	scheme := scheme.Scheme
+	if err := appsv1.SchemeBuilder.AddToScheme(scheme); err != nil {
+		logger.Error(err, "failed to add apps/v1 scheme to runtime scheme")
+		os.Exit(1)
+	}
+	if err := kedav1alpha1.SchemeBuilder.AddToScheme(scheme); err != nil {
+		logger.Error(err, "failed to add keda scheme to runtime scheme")
+		os.Exit(1)
+	}
+
+	kubeclient, err := client.New(cfg, client.Options{
+		Scheme: scheme,
+	})
+	if err != nil {
+		logger.Error(err, "unable to construct new client")
+		os.Exit(1)
+	}
+
+	handler := handler.NewScaleHandler(kubeclient, scheme)
+
+	namespace, err := k8sutil.GetWatchNamespace()
+	if err != nil {
+		logger.Error(err, "failed to get watch namespace")
+		os.Exit(1)
+	}
+
+	return kedaprovider.NewProvider(logger, handler, kubeclient, namespace)
+}
+
+func main() {
+	defer klog.Flush()
+
+	cmd := &Adapter{}
+	cmd.Flags().StringVar(&cmd.Message, "msg", "starting adapter...", "startup message")
+	cmd.Flags().AddGoFlagSet(flag.CommandLine) // make sure we get the klog flags
+	cmd.Flags().Parse(os.Args)
+
+	kedaProvider := cmd.makeProviderOrDie()
+	cmd.WithExternalMetrics(kedaProvider)
+
+	logger.Info(cmd.Message)
+	if err := cmd.Run(wait.NeverStop); err != nil {
+		logger.Error(err, "unable to run external metrics adapter")
+		os.Exit(1)
+	}
+}