Merge pull request #49 from DataDog/v0.3

release v0.3.0 to master

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.13 as builder
+FROM golang:1.14 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

RELEASING.md

@@ -2,7 +2,7 @@
 
 ## Steps
 
-1. Checkout the repository on the correct branch and changeset (`master`).
+1. Checkout the repository on the correct branch and changeset (`master`).Creates a new branch if it is the first release for a "minor" version: `git checkout -b vX.Y`.
 2. Run the bundle generation:
     - For a release candidate, run the following command, locally: `make VERSION=x.v.z-rc.w bundle`
       For example, to generate the release version `0.3.0-rc.2`, run: `make VERSION=0.3.0-rc.2 bundle`
@@ -21,7 +21,7 @@
 5. Push the generated commit and tag to the repostory branch.
 
    ```console
-   $ git push origin master
+   $ git push origin vX.Y
    $ git push origin vX.Y.Z
    ```
 

bundle/manifests/extendeddaemonset.clusterserviceversion.yaml

@@ -73,7 +73,7 @@ metadata:
     capabilities: Full Lifecycle
     operators.operatorframework.io/builder: operator-sdk-v1.0.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
-  name: extendeddaemonset.v0.2.0
+  name: extendeddaemonset.v0.3.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -203,7 +203,7 @@ spec:
       deployments:
       - name: eds-controller-manager
         spec:
-          replicas: 1
+          replicas: 2
           selector:
             matchLabels:
               app.kubernetes.io/name: extendeddaemonset
@@ -243,10 +243,10 @@ spec:
                 resources:
                   limits:
                     cpu: 100m
-                    memory: 30Mi
+                    memory: 100Mi
                   requests:
                     cpu: 100m
-                    memory: 20Mi
+                    memory: 100Mi
               terminationGracePeriodSeconds: 10
       permissions:
       - rules:
@@ -303,4 +303,5 @@ spec:
   provider:
     name: Datadog
     url: https://github.com/DataDog/extendeddaemonset
-  version: 0.2.0
+  replaces: extendeddaemonset.v0.2.0
+  version: 0.3.0

chart/extendeddaemonset/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.2.0
+appVersion: v0.3.0
 description: Extended Daemonset Controller
 name: extendeddaemonset
-version: v0.2.0
+version: v0.3.0

chart/extendeddaemonset/values.yaml

@@ -5,7 +5,7 @@
 replicaCount: 1
 image:
   repository: datadog/extendeddaemonset
-  tag: v0.2.0
+  tag: v0.3.0
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 nameOverride: ""

examples/foo-eds_exclude-node.yaml

@@ -0,0 +1,28 @@
+apiVersion: datadoghq.com/v1alpha1
+kind: ExtendedDaemonSet
+metadata:
+  name: foo
+spec:
+  strategy:
+    canary:
+      replicas: 1
+      duration: 5m
+    rollingUpdate:
+      maxParallelPodCreation: 1
+      slowStartIntervalDuration: 1m
+  template:
+    spec: 
+      containers:
+      - name: daemon
+        image: k8s.gcr.io/pause:3.0
+      tolerations:
+      - operator: Exists
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: extendeddaemonset.datadoghq.com/exclude
+                operator: NotIn
+                values:
+                - foo

examples/foo-eds_v1.yaml

@@ -0,0 +1,19 @@
+apiVersion: datadoghq.com/v1alpha1
+kind: ExtendedDaemonSet
+metadata:
+  name: foo
+spec:
+  strategy:
+    canary:
+      replicas: 1
+      duration: 5m
+    rollingUpdate:
+      maxParallelPodCreation: 1
+      slowStartIntervalDuration: 1m
+  template:
+    spec: 
+      containers:
+      - name: daemon
+        image: k8s.gcr.io/pause:3.0
+      tolerations:
+      - operator: Exists

examples/foo-eds_v2.yaml

@@ -0,0 +1,19 @@
+apiVersion: datadoghq.com/v1alpha1
+kind: ExtendedDaemonSet
+metadata:
+  name: foo
+spec:
+  strategy:
+    canary:
+      replicas: 1
+      duration: 5m
+    rollingUpdate:
+      maxParallelPodCreation: 1
+      slowStartIntervalDuration: 1m
+  template:
+    spec: 
+      containers:
+      - name: daemon
+        image: k8s.gcr.io/pause:3.1
+      tolerations:
+      - operator: Exists

main.go

@@ -61,6 +61,8 @@ func main() {
 
 	// Custom flags
 	var printVersion, pprofActive bool
+	var logEncoder string
+	flag.StringVar(&logEncoder, "logEncoder", "json", "log encoding ('json' or 'console')")
 	logLevel := zap.LevelFlag("loglevel", zapcore.InfoLevel, "Set log level")
 	flag.BoolVar(&printVersion, "version", false, "Print version and exit")
 	flag.BoolVar(&pprofActive, "pprof", false, "Enable pprof endpoint")
@@ -69,7 +71,10 @@ func main() {
 	flag.Parse()
 
 	// Logging setup
-	customSetupLogging(*logLevel)
+	if err := customSetupLogging(*logLevel, logEncoder); err != nil {
+		setupLog.Error(err, "unable to setup the logger")
+		os.Exit(1)
+	}
 
 	// Print version information
 	if printVersion {
@@ -85,7 +90,7 @@ func main() {
 		HealthProbeBindAddress: ":8081",
 		Port:                   9443,
 		LeaderElection:         enableLeaderElection,
-		LeaderElectionID:       "e361fbac.datadoghq.com",
+		LeaderElectionID:       "extendeddaemonset-lock",
 	}))
 	if err != nil {
 		setupLog.Error(err, "unable to start manager")
@@ -146,12 +151,24 @@ func customSetupEnvironment(mgr manager.Manager) {
 	}
 }
 
-func customSetupLogging(logLevel zapcore.Level) {
+func customSetupLogging(logLevel zapcore.Level, logEncoder string) error {
+	var encoder zapcore.Encoder
+	switch logEncoder {
+	case "console":
+		encoder = zapcore.NewConsoleEncoder(zap.NewProductionEncoderConfig())
+	case "json":
+		encoder = zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig())
+	default:
+		return fmt.Errorf("unknow log encoder: %s", logEncoder)
+	}
+
 	ctrl.SetLogger(ctrlzap.New(
-		ctrlzap.Encoder(zapcore.NewConsoleEncoder(zap.NewProductionEncoderConfig())),
+		ctrlzap.Encoder(encoder),
 		ctrlzap.Level(logLevel),
 		ctrlzap.StacktraceLevel(zapcore.PanicLevel)),
 	)
+
+	return nil
 }
 
 func customSetupHealthChecks(mgr manager.Manager) {