0.2.0 (#203)

Synchronize helm chart version with mondoo operator version to 0.2.0 for both.

Signed-off-by: Joel Diaz <joel@mondoo.com>

bundle.Dockerfile

@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=mondoo-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.18.0+git
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.18.1
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

charts/mondoo-operator/Chart.yaml

@@ -13,9 +13,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.6
+version: 0.2.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.0.13"
+appVersion: "0.2.0"

charts/mondoo-operator/templates/deployment.yaml

@@ -39,22 +39,9 @@ spec:
       {{- include "mondoo-operator.selectorLabels" . | nindent 8 }}
     spec:
       containers:
-      - args:
-        - --secure-listen-address=0.0.0.0:8443
-        - --upstream=http://127.0.0.1:8080/
-        - --logtostderr=true
-        - --v=10
-        image: {{ .Values.controllerManager.kubeRbacProxy.image.repository }}:{{ .Values.controllerManager.kubeRbacProxy.image.tag
-          | default .Chart.AppVersion }}
-        name: kube-rbac-proxy
-        ports:
-        - containerPort: 8443
-          name: https
-          protocol: TCP
-        resources: {}
       - args:
         - --health-probe-bind-address=:8081
-        - --metrics-bind-address=127.0.0.1:8080
+        - --metrics-bind-address=:8080
         - --leader-elect
         command:
         - /manager
@@ -67,6 +54,10 @@ spec:
           initialDelaySeconds: 15
           periodSeconds: 20
         name: manager
+        ports:
+        - containerPort: 8080
+          name: metrics
+          protocol: TCP
         readinessProbe:
           httpGet:
             path: /readyz

charts/mondoo-operator/templates/manager-rbac.yaml

@@ -82,18 +82,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
 - apiGroups:
   - ""
   resources:
@@ -133,21 +121,30 @@ rules:
   - patch
   - update
 - apiGroups:
-  - rbac.authorization.k8s.io
+  - k8s.mondoo.com
   resources:
-  - clusterrolebindings
+  - mondoooperatorconfigs
+  verbs:
+  - get
+  - watch
+- apiGroups:
+  - k8s.mondoo.com
+  resources:
+  - mondoooperatorconfigs/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - k8s.mondoo.com
+  resources:
+  - mondoooperatorconfigs/status
   verbs:
-  - create
-  - delete
   - get
-  - list
   - patch
   - update
-  - watch
 - apiGroups:
-  - rbac.authorization.k8s.io
+  - monitoring.coreos.com
   resources:
-  - clusterroles
+  - servicemonitors
   verbs:
   - create
   - delete

charts/mondoo-operator/templates/mondooauditconfig-crd.yaml

@@ -99,6 +99,13 @@ spec:
                     type: object
                   enable:
                     type: boolean
+                  image:
+                    properties:
+                      name:
+                        type: string
+                      tag:
+                        type: string
+                    type: object
                 required:
                 - enable
                 type: object
@@ -152,7 +159,7 @@ spec:
             description: MondooAuditConfigStatus defines the observed state of MondooAuditConfig
             properties:
               pods:
-                description: Nodes store the name of the pods which are running mondoo
+                description: Pods store the name of the pods which are running mondoo
                   instances
                 items:
                   type: string

charts/mondoo-operator/templates/mondoooperatorconfig-crd.yaml

@@ -0,0 +1,104 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: mondoooperatorconfigs.k8s.mondoo.com
+  annotations:
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "mondoo-operator.fullname" . }}-
+    controller-gen.kubebuilder.io/version: v0.7.0
+  labels:
+  {{- include "mondoo-operator.labels" . | nindent 4 }}
+spec:
+  group: k8s.mondoo.com
+  names:
+    kind: MondooOperatorConfig
+    listKind: MondooOperatorConfigList
+    plural: mondoooperatorconfigs
+    singular: mondoooperatorconfig
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: MondooOperatorConfig is the Schema for the mondoooperatorconfigs
+          API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: MondooOperatorConfigSpec defines the desired state of MondooOperatorConfig
+            properties:
+              metrics:
+                description: Metrics controls the enabling/disabling of metrics report
+                  of mondoo-operator
+                properties:
+                  enable:
+                    type: boolean
+                  resourceLabels:
+                    additionalProperties:
+                      type: string
+                    description: ResourceLabels allows providing a list of extra labels
+                      to apply to the metrics-related resources (eg. ServiceMonitor)
+                    type: object
+                type: object
+            type: object
+          status:
+            description: MondooOperatorConfigStatus defines the observed state of MondooOperatorConfig
+            properties:
+              conditions:
+                description: Conditions includes more detailed status for the mondoo
+                  config
+                items:
+                  description: Condition contains details for the current condition
+                    of a MondooOperatorConfig
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the last time the condition
+                        transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    lastUpdateTime:
+                      description: LastUpdateTime is the last time the condition was
+                        updated.
+                      format: date-time
+                      type: string
+                    message:
+                      description: Message is a human-readable message indicating details
+                        about last transition.
+                      type: string
+                    reason:
+                      description: Reason is a unique, one-word, CamelCase reason for
+                        the condition's last transition.
+                      type: string
+                    status:
+                      description: Status is the status of the condition.
+                      type: string
+                    type:
+                      description: Type is the type of the condition.
+                      type: string
+                  required:
+                  - status
+                  - type
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

charts/mondoo-operator/values.yaml

@@ -1,8 +1,4 @@
 controllerManager:
-  kubeRbacProxy:
-    image:
-      repository: gcr.io/kubebuilder/kube-rbac-proxy
-      tag: v0.8.0
   manager:
     image:
       repository: ghcr.io/mondoohq/mondoo-operator
@@ -28,8 +24,8 @@ managerConfig:
       port: 9443
 metricsService:
   ports:
-  - name: https
-    port: 8443
+  - name: metrics
+    port: 8080
     protocol: TCP
-    targetPort: https
+    targetPort: metrics
   type: ClusterIP

config/manager/kustomization.yaml

@@ -14,4 +14,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: ghcr.io/mondoohq/mondoo-operator
-  newTag: v0.0.13
+  newTag: v0.2.0

config/manifests/bases/mondoo-operator.clusterserviceversion.yaml

@@ -24,6 +24,12 @@ spec:
       kind: MondooAuditConfig
       name: mondooauditconfigs.k8s.mondoo.com
       version: v1alpha1
+    - description: MondooOperatorConfig is the Schema for the mondoooperatorconfigs
+        API
+      displayName: Mondoo Operator Config
+      kind: MondooOperatorConfig
+      name: mondoooperatorconfigs.k8s.mondoo.com
+      version: v1alpha1
   description: A Kubernetes Operator for creating and managing Mondoo controller instances.
   displayName: mondoo-operator
   icon: