Merge pull request #7 from kloeckner-i/configurable_reconcile_period

improve pipeline speed

Author: hyunysmile

Dockerfile

@@ -4,8 +4,14 @@ RUN apk update && apk upgrade && \
     apk add --no-cache bash build-base
 
 WORKDIR /opt/db-operator
-COPY . .
 
+# to reduce docker build time download dependency first before building
+COPY go.mod .
+COPY go.sum .
+RUN go mod download
+
+# build
+COPY . .
 RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -tags build -o /usr/local/bin/db-operator ./cmd/manager
 
 FROM alpine:3.11

Makefile

@@ -32,8 +32,7 @@ build:
 	operator-sdk build my-db-operator:local
 
 helm: helm-init
-	@helm upgrade --install --namespace default my-dboperator helm/db-operator -f helm/db-operator/values.yaml -f helm/db-operator/values-local.yaml
-	@helm upgrade --install --namespace default my-dbins helm/db-instances --set operatorNamespace="default" -f helm/db-instances/values.yaml -f helm/db-instances/values-local.yaml
+	@helm upgrade --install --namespace operator my-dboperator helm/db-operator -f helm/db-operator/values.yaml -f helm/db-operator/values-local.yaml
 
 helm-init:
 	@helm init --upgrade --wait

helm/db-instances/values-local.yaml

@@ -51,6 +51,8 @@ spec:
               value: "db-operator"
             - name: WATCH_NAMESPACE
               value: "" # it's necessary to set "" to watch cluster wide 
+            - name: RECONCILE_INTERVAL
+              value: {{ .Values.reconcileInterval | quote }}
             - name: POD_NAME
               valueFrom:
                 fieldRef:

helm/db-operator/templates/operator.yaml

@@ -3,3 +3,5 @@ image:
   tag: "local"
   pullPolicy: IfNotPresent
 
+
+reconcileInterval: "10"

helm/db-operator/values-local.yaml

@@ -8,6 +8,7 @@ image:
 # imagePullSecrets:
 #   - name: myRegistrySecret
 
+reconcileInterval: "60"
 
 rbac:
   create: true

helm/db-operator/values.yaml

@@ -2,4 +2,4 @@ postgres:
   serviceName: pg-test-db
   adminUser: postgres
   adminPassword: test1234
-  image: postgres:10.4
+  image: postgres:11

integration/postgres/values.yaml

@@ -3,6 +3,8 @@ package database
 import (
 	"context"
 	"errors"
+	"os"
+	"strconv"
 	"time"
 
 	kciv1alpha1 "github.com/kloeckner-i/db-operator/pkg/apis/kci/v1alpha1"
@@ -34,7 +36,13 @@ func Add(mgr manager.Manager) error {
 
 // newReconciler returns a new reconcile.Reconciler
 func newReconciler(mgr manager.Manager) reconcile.Reconciler {
-	return &ReconcileDatabase{client: mgr.GetClient(), scheme: mgr.GetScheme(), recorder: mgr.GetEventRecorderFor("database-controller")}
+	interval := os.Getenv("RECONCILE_INTERVAL")
+	i, err := strconv.ParseInt(interval, 10, 64)
+	if err != nil {
+		i = 60
+		logrus.Infof("Set default reconcile period to %d s for database-controller", i)
+	}
+	return &ReconcileDatabase{client: mgr.GetClient(), scheme: mgr.GetScheme(), recorder: mgr.GetEventRecorderFor("database-controller"), interval: time.Duration(i)}
 }
 
 // add adds a new Controller to mgr with r as the reconcile.Reconciler
@@ -74,6 +82,7 @@ type ReconcileDatabase struct {
 	client   client.Client
 	scheme   *runtime.Scheme
 	recorder record.EventRecorder
+	interval time.Duration
 }
 
 var (
@@ -100,7 +109,7 @@ func (r *ReconcileDatabase) Reconcile(request reconcile.Request) (reconcile.Resu
 	// reqLogger := log.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
 	// reqLogger.Info("Reconciling Database")
 
-	reconcilePeriod := 60 * time.Second
+	reconcilePeriod := r.interval * time.Second
 	reconcileResult := reconcile.Result{RequeueAfter: reconcilePeriod}
 
 	ctx := context.TODO()

pkg/controller/database/controller.go

@@ -3,6 +3,8 @@ package dbinstance
 import (
 	"context"
 	"errors"
+	"os"
+	"strconv"
 	"time"
 
 	kciv1alpha1 "github.com/kloeckner-i/db-operator/pkg/apis/kci/v1alpha1"
@@ -28,7 +30,13 @@ func Add(mgr manager.Manager) error {
 
 // newReconciler returns a new reconcile.Reconciler
 func newReconciler(mgr manager.Manager) reconcile.Reconciler {
-	return &ReconcileDbInstance{client: mgr.GetClient(), scheme: mgr.GetScheme()}
+	interval := os.Getenv("RECONCILE_INTERVAL")
+	i, err := strconv.ParseInt(interval, 10, 64)
+	if err != nil {
+		i = 60
+		logrus.Infof("Set default reconcile period to %d s for dbinstance-controller", i)
+	}
+	return &ReconcileDbInstance{client: mgr.GetClient(), scheme: mgr.GetScheme(), interval: time.Duration(i)}
 }
 
 // add adds a new Controller to mgr with r as the reconcile.Reconciler
@@ -55,8 +63,9 @@ var _ reconcile.Reconciler = &ReconcileDbInstance{}
 type ReconcileDbInstance struct {
 	// This client, initialized using mgr.Client() above, is a split client
 	// that reads objects from the cache and writes to the apiserver
-	client client.Client
-	scheme *runtime.Scheme
+	client   client.Client
+	scheme   *runtime.Scheme
+	interval time.Duration
 }
 
 var (
@@ -75,7 +84,7 @@ var (
 func (r *ReconcileDbInstance) Reconcile(request reconcile.Request) (reconcile.Result, error) {
 	// reqLogger := log.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
 	// reqLogger.Info("Reconciling DbInstance")
-	reconcilePeriod := 60 * time.Second
+	reconcilePeriod := r.interval * time.Second
 	reconcileResult := reconcile.Result{RequeueAfter: reconcilePeriod}
 
 	ctx := context.TODO()