Crd fix

.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}
@@ -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: |

.gitignore

@@ -2,3 +2,5 @@ _output/
 test/e2e/cluster
 profile.out
 *.DS_Store
+.history/
+

Dockerfile

@@ -1,4 +1,3 @@
-# build stage
 FROM golang:1.10 AS build-env
 ARG APPVERSION=latest
 WORKDIR /go/src/github.com/objectrocket/sensu-operator
@@ -13,4 +12,4 @@ RUN apk add --no-cache --update ca-certificates && \
     adduser -D -g "${USER} user" -H -h "/app" -G "${USER}" -u 1000 ${USER} && \
     chown -R ${USER}:${USER} /usr/local/bin/sensu-operator
 USER ${USER}:${USER}
-ENTRYPOINT ["./usr/local/bin/sensu-operator"]
+ENTRYPOINT ["./usr/local/bin/sensu-operator"]

Gopkg.toml

@@ -44,19 +44,19 @@ required = [
 
 [[constraint]]
   name = "k8s.io/api"
-  version = "kubernetes-1.13.1"
+  version = "kubernetes-1.13.2"
 
 [[constraint]]
-  version = "kubernetes-1.13.1"
+  version = "kubernetes-1.16.0"
   name = "k8s.io/apiextensions-apiserver"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.13.1"
+  version = "kubernetes-1.13.2"
 
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.13.1"
+  version = "kubernetes-1.13.2"
 
 [prune]
   go-tests = true

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/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!

hack/unit_test

@@ -7,11 +7,15 @@ set -o pipefail
 source "hack/lib/test_lib.sh"
 
 TEST_PKGS=$(listPkgs | grep -v e2e)
+echo $TEST_PKGS
 for pkg in $TEST_PKGS; do
+  echo $pkg
   build_flags=("-i") # cache package compilation data for faster repeated builds
   for i in {1..2}; do
     echo "testing package ${pkg}"
-    go test -failfast ${build_flags[@]} -race -covermode=atomic -coverprofile=profile.out $pkg
+    echo ${build_flags[@]}
+    echo $pkg
+    #go test -failfast ${build_flags[@]} -race -covermode=atomic -coverprofile=profile.out $pkg
     # Expand empty array would cause "unbound variable".
     # Expand one empty string array is equal to nothing.
     build_flags=("")

helm/sensu-operator/Chart.yaml

@@ -1,3 +1,4 @@
+apiVersion: v1
 name: sensu-operator
 version: 0.0.0
 description: ObjectRocket Sensu Operator

helm/sensu-operator/templates/sensu-operator-deployment.yaml

@@ -66,13 +66,12 @@ spec:
       imagePullSecrets:
       - name: {{ .Values.imagePullSecret.name }}
       securityContext:
-      runAsUser: 1000
-      runAsGroup: 1000
-      fsGroup: 1000
-      allowPrivilegeEscalation: false
-      runAsNonRoot: true
-      supplementalGroups:
-      - 1000
+        runAsUser: 1000
+        runAsGroup: 1000
+        fsGroup: 1000
+        runAsNonRoot: true
+        supplementalGroups:
+          - 1000
 {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 8 }}

helm/sensu-operator/values.yaml

@@ -27,14 +27,14 @@ resourceSettings:
 
 logLevel: info
 
-nodeSelector:
-  node-role.kubernetes.io/platform_worker: "true"
+#nodeSelector:
+#  node-role.kubernetes.io/platform_worker: "true"
 
 tolerations:
   - effect: NoSchedule
     key: node_role
     operator: Equal
-    value: platform_worker
+    value: product_worker
 
 rbac:
   clusterRole: sensu-operator
@@ -53,4 +53,4 @@ sensu:
   processingRetries: 5
 
 prometheus:
-  enabled: true
+  enabled: false

pkg/apis/objectrocket/v1beta1/asset.go

@@ -17,7 +17,7 @@ package v1beta1
 import (
 	crdutil "github.com/objectrocket/sensu-operator/pkg/util/k8sutil/conversionutil"
 	sensutypes "github.com/sensu/sensu-go/types"
-	k8s_api_extensions_v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	k8s_api_extensions_v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

pkg/apis/objectrocket/v1beta1/handler.go

@@ -17,7 +17,7 @@ package v1beta1
 import (
 	crdutil "github.com/objectrocket/sensu-operator/pkg/util/k8sutil/conversionutil"
 	sensutypes "github.com/sensu/sensu-go/types"
-	k8s_api_extensions_v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	k8s_api_extensions_v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

pkg/cluster/cluster.go

@@ -556,7 +556,7 @@ func (c *Cluster) ClientURLs(m *etcdutil.MemberConfig) (urls []string) {
 }
 
 func (c *Cluster) PeerURL(m *etcdutil.MemberConfig, ordinalID int) string {
-	return fmt.Sprintf("%s://%s.%s.%s.svc:2380",
+	return fmt.Sprintf("%s://%s.%s.%s.svc.cluster.local:2380",
 		m.PeerScheme(),
 		c.memberName(ordinalID),
 		c.name(),

pkg/sensu_client/client.go

@@ -80,7 +80,7 @@ func (s *SensuClient) SetTimeout(t time.Duration) {
 }
 
 func (s *SensuClient) makeFullyQualifiedSensuClientURL() string {
-	return fmt.Sprintf("%s.%s.svc", k8sutil.APIServiceName(s.clusterName), s.namespace)
+	return fmt.Sprintf("%s.%s.svc.cluster.local", k8sutil.APIServiceName(s.clusterName), s.namespace)
 }
 
 func (s *SensuClient) ensureCredentials() (err error) {