Crd2

.circleci/config.yml

@@ -32,7 +32,7 @@ orbs:
 jobs:
   markdownlint:
     docker:
-    - image: circleci/node:10.14.2
+    - image: cimg/node:18.14.1
       auth:
         username: ${DOCKER_USERNAME}
         password: ${DOCKER_PASSWORD}
@@ -47,9 +47,9 @@ jobs:
         name: lint README.md
         command: markdownlint --config .markdownlint.json README.md
   build:
-    working_directory: /go/src/github.com/objectrocket/sensu-operator
+    working_directory: go/src/github.com/objectrocket/sensu-operator
     docker:
-    - image: circleci/golang:1.10
+    - image: cimg/go:1.18
       auth:
         username: ${DOCKER_USERNAME}
         password: ${DOCKER_PASSWORD}
@@ -61,9 +61,9 @@ jobs:
         name: Build the server binary and docker image
         command: make docker-build IMAGE_VERSION=latest
   unit_test:
-    working_directory: /go/src/github.com/objectrocket/sensu-operator
+    working_directory: go/src/github.com/objectrocket/sensu-operator
     docker:
-    - image: circleci/golang:1.10
+    - image: cimg/go:1.18
       auth:
         username: ${DOCKER_USERNAME}
         password: ${DOCKER_PASSWORD}
@@ -73,9 +73,9 @@ jobs:
         name: go tests
         command: make unittest
   build_deploy:
-    working_directory: /go/src/github.com/objectrocket/sensu-operator
+    working_directory: go/src/github.com/objectrocket/sensu-operator
     docker:
-    - image: circleci/golang:1.10
+    - image: cimg/go:1.18
       auth:
         username: ${DOCKER_USERNAME}
         password: ${DOCKER_PASSWORD}
@@ -86,7 +86,7 @@ jobs:
     - run:
         name: docker login
         command: |
-          docker login -u $DOCKER_USER -p $DOCKER_PASS
+          docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
     - run:
         name: docker build and push
         command: |

Dockerfile

@@ -1,11 +1,11 @@
 # build stage
-FROM golang:1.10 AS build-env
+FROM golang:1.18 AS build-env
 ARG APPVERSION=latest
 WORKDIR /go/src/github.com/objectrocket/sensu-operator
 COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-X github.com/objectrocket/sensu-operator/version.Version=$APPVERSION" -o _output/sensu-operator -i cmd/operator/main.go
 
-FROM alpine:3.6
+FROM alpine:3.12
 ENV USER=sensu-operator
 COPY --from=build-env /go/src/github.com/objectrocket/sensu-operator/_output/sensu-operator /usr/local/bin/sensu-operator
 RUN apk add --no-cache --update ca-certificates && \

Gopkg.toml

@@ -47,7 +47,7 @@ required = [
   version = "kubernetes-1.13.1"
 
 [[constraint]]
-  version = "kubernetes-1.13.1"
+  version = "kubernetes-1.16.0"
   name = "k8s.io/apiextensions-apiserver"
 
 [[constraint]]

cmd/operator/main.go

@@ -39,6 +39,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
+//	"k8s.io/client-go/kubernetes/typed/coordination/v1"
 	v1core "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/tools/leaderelection"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
@@ -163,6 +164,7 @@ func mainLoop() {
 		namespace,
 		"sensu-operator",
 		kubecli.CoreV1(),
+		kubecli.CoordinationV1(),
 		resourcelock.ResourceLockConfig{
 			Identity:      id,
 			EventRecorder: createRecorder(kubecli, name, namespace),
@@ -241,6 +243,6 @@ func getMyPodServiceAccount(kubecli kubernetes.Interface) (string, error) {
 func createRecorder(kubecli kubernetes.Interface, name, namespace string) record.EventRecorder {
 	eventBroadcaster := record.NewBroadcaster()
 	eventBroadcaster.StartLogging(logrus.Infof)
-	eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(kubecli.Core().RESTClient()).Events(namespace)})
+	eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(kubecli.CoreV1().RESTClient()).Events(namespace)})
 	return eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: name})
 }

example/agent-daemonset.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: extensions/v1
 kind: DaemonSet
 metadata:
   name: sensu-agent

example/backup-operator/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: extensions/v1
 kind: Deployment
 metadata:
   name: sensu-backup-operator

example/deployment.yaml

@@ -12,22 +12,28 @@ metadata:
   namespace: sensu
 
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: sensu-operator
   namespace: sensu
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: sensu-operator
+      release: sensu-operator
   template:
     metadata:
       labels:
         name: sensu-operator
+        release: sensu-operator
+        app: sensu-operator
     spec:
       containers:
       - name: sensu-operator
         image: objectrocket/sensu-operator:latest
-        imagePullPolicy: Never
+        imagePullPolicy: Always
         env:
         - name: MY_POD_NAMESPACE
           valueFrom:
@@ -49,3 +55,5 @@ spec:
           value: "4"
         - name: SENSUOP_PROCESSING_RETRIES
           value: "5"
+        imagePullSecrets:
+          - name: 'or-docker-secret'

example/dummy-agent-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: extensions/v1
 kind: Deployment
 metadata:
   name: dummy-service

example/example-sensu-cluster-objectrocket.yaml

@@ -3,7 +3,7 @@ kind: SensuCluster
 metadata:
   annotations:
     objectrocket.com/scope: clusterwide
-  name: platdev0
+  name: sensu
   namespace: sensu
 spec:
   pod:
@@ -14,7 +14,9 @@ spec:
       resources:
         requests:
           storage: 8Gi
-      storageClassName: standard
-  repository: sensu/sensu
-  size: 1
-  version: 5.14.0
+      storageClassName: gp2
+  repository: objectrocket/sensu-backend
+  size: 5
+  version: 5.20.2_or2
+  clusteradminusername: admin
+  clusteradminpassword: p@ssw0rd!

example/rbac/cluster-role-binding-template.yaml

@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: <ROLE_BINDING_NAME>

example/rbac/cluster-role-template.yaml

@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: <ROLE_NAME>

example/rbac/role-binding-template.yaml

@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: <ROLE_BINDING_NAME>

example/rbac/role-template.yaml

@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: <ROLE_NAME>

example/restore-operator/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: extensions/v1
 kind: Deployment
 metadata:
   name: sensu-restore-operator