From 0eb9ded9c287f60bfcf16c945c5a836ee4670155 Mon Sep 17 00:00:00 2001 From: Ivan Milchev Date: Mon, 25 Sep 2023 17:15:16 +0300 Subject: [PATCH 1/5] 1.16.0 Signed-off-by: Ivan Milchev --- charts/mondoo-operator/Chart.yaml | 4 ++-- charts/mondoo-operator/templates/deployment.yaml | 2 ++ charts/mondoo-operator/templates/manager-config.yaml | 3 --- charts/mondoo-operator/templates/manager-rbac.yaml | 3 --- .../mondoo-operator/templates/mondoooperatorconfig-crd.yaml | 4 ++++ charts/mondoo-operator/values.yaml | 5 +---- config/manager/kustomization.yaml | 2 +- config/webhook/kustomization.yaml | 2 +- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/charts/mondoo-operator/Chart.yaml b/charts/mondoo-operator/Chart.yaml index c55bbf726..f45bfacbc 100755 --- a/charts/mondoo-operator/Chart.yaml +++ b/charts/mondoo-operator/Chart.yaml @@ -16,9 +16,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: 1.15.2 +version: 1.16.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: "1.15.2" +appVersion: "1.16.0" diff --git a/charts/mondoo-operator/templates/deployment.yaml b/charts/mondoo-operator/templates/deployment.yaml index 7a58b3936..49dc64b4e 100644 --- a/charts/mondoo-operator/templates/deployment.yaml +++ b/charts/mondoo-operator/templates/deployment.yaml @@ -32,10 +32,12 @@ spec: replicas: {{ .Values.controllerManager.replicas }} selector: matchLabels: + app.kubernetes.io/name: mondoo-operator {{- include "mondoo-operator.selectorLabels" . | nindent 6 }} template: metadata: labels: + app.kubernetes.io/name: mondoo-operator {{- include "mondoo-operator.selectorLabels" . | nindent 8 }} annotations: kubectl.kubernetes.io/default-container: manager diff --git a/charts/mondoo-operator/templates/manager-config.yaml b/charts/mondoo-operator/templates/manager-config.yaml index 8761d5e06..21660a437 100644 --- a/charts/mondoo-operator/templates/manager-config.yaml +++ b/charts/mondoo-operator/templates/manager-config.yaml @@ -1,6 +1,3 @@ -# Copyright (c) Mondoo, Inc. -# SPDX-License-Identifier: BUSL-1.1 - apiVersion: v1 kind: ConfigMap metadata: diff --git a/charts/mondoo-operator/templates/manager-rbac.yaml b/charts/mondoo-operator/templates/manager-rbac.yaml index 029d5f410..328b2d760 100644 --- a/charts/mondoo-operator/templates/manager-rbac.yaml +++ b/charts/mondoo-operator/templates/manager-rbac.yaml @@ -1,6 +1,3 @@ -# Copyright (c) Mondoo, Inc. -# SPDX-License-Identifier: BUSL-1.1 - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/charts/mondoo-operator/templates/mondoooperatorconfig-crd.yaml b/charts/mondoo-operator/templates/mondoooperatorconfig-crd.yaml index 1c9e61598..08e5c15c0 100644 --- a/charts/mondoo-operator/templates/mondoooperatorconfig-crd.yaml +++ b/charts/mondoo-operator/templates/mondoooperatorconfig-crd.yaml @@ -39,6 +39,10 @@ spec: spec: description: MondooOperatorConfigSpec defines the desired state of MondooOperatorConfig properties: + httpProxy: + description: HttpProxy specifies a proxy to use for HTTP requests to + the Mondoo platform. + type: string metrics: description: Metrics controls the enabling/disabling of metrics report of mondoo-operator diff --git a/charts/mondoo-operator/values.yaml b/charts/mondoo-operator/values.yaml index c55702b9c..f28011e19 100644 --- a/charts/mondoo-operator/values.yaml +++ b/charts/mondoo-operator/values.yaml @@ -1,6 +1,3 @@ -# Copyright (c) Mondoo, Inc. -# SPDX-License-Identifier: BUSL-1.1 - controllerManager: manager: args: @@ -17,7 +14,7 @@ controllerManager: readOnlyRootFilesystem: true image: repository: ghcr.io/mondoohq/mondoo-operator - tag: v1.15.2 + tag: v1.16.0 imagePullPolicy: IfNotPresent resources: limits: diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 68f8f5513..fe2f578dd 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -17,4 +17,4 @@ kind: Kustomization images: - name: controller newName: ghcr.io/mondoohq/mondoo-operator - newTag: v1.15.2 + newTag: v1.16.0 diff --git a/config/webhook/kustomization.yaml b/config/webhook/kustomization.yaml index 6c829156f..4eb7e0fc1 100644 --- a/config/webhook/kustomization.yaml +++ b/config/webhook/kustomization.yaml @@ -10,4 +10,4 @@ resources: images: - name: controller newName: ghcr.io/mondoohq/mondoo-operator - newTag: v1.15.2 + newTag: v1.16.0 From a16d2e387d44479f10d68549249c77dbe891708e Mon Sep 17 00:00:00 2001 From: Ivan Milchev Date: Mon, 25 Sep 2023 19:13:09 +0300 Subject: [PATCH 2/5] ignore yaml files for license checker Signed-off-by: Ivan Milchev --- .copywrite.hcl | 1 + .github/workflows/cla.yaml | 2 +- .github/workflows/lint.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.copywrite.hcl b/.copywrite.hcl index ed2142c12..536f4622e 100644 --- a/.copywrite.hcl +++ b/.copywrite.hcl @@ -13,5 +13,6 @@ project { "**/testdata/**", "**/*.pb.go", "**/*_string.go", + "charts/mondoo-operator/**", ] } \ No newline at end of file diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml index 6d863ee70..4092ad4b7 100644 --- a/.github/workflows/cla.yaml +++ b/.github/workflows/cla.yaml @@ -1,4 +1,4 @@ -name: "CLA Assistant & License Check" +name: "CLA Assistant" on: issue_comment: types: [created] diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 221b68f03..c0540a47f 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,4 +1,4 @@ -name: Lint +name: "Lint & License Check" on: pull_request: push: From a1710c24036f20584c8d8277e728cc14bf42ebe2 Mon Sep 17 00:00:00 2001 From: Ivan Milchev Date: Tue, 26 Sep 2023 09:11:36 +0300 Subject: [PATCH 3/5] re-generate files with gsed Signed-off-by: Ivan Milchev --- charts/mondoo-operator/templates/deployment.yaml | 5 ----- .../templates/k8s-resources-scanning-rbac.yaml | 3 --- charts/mondoo-operator/templates/leader-election-rbac.yaml | 3 --- charts/mondoo-operator/templates/metrics-service.yaml | 3 --- charts/mondoo-operator/templates/mondooauditconfig-crd.yaml | 3 --- .../mondoo-operator/templates/mondoooperatorconfig-crd.yaml | 3 --- charts/mondoo-operator/values.yaml | 2 ++ .../bases/mondoo-operator.clusterserviceversion.yaml | 3 --- config/rbac/role.yaml | 3 --- config/webhook/manifests.yaml | 3 --- 10 files changed, 2 insertions(+), 29 deletions(-) diff --git a/charts/mondoo-operator/templates/deployment.yaml b/charts/mondoo-operator/templates/deployment.yaml index 49dc64b4e..1b44ed237 100644 --- a/charts/mondoo-operator/templates/deployment.yaml +++ b/charts/mondoo-operator/templates/deployment.yaml @@ -1,6 +1,3 @@ -# Copyright (c) Mondoo, Inc. -# SPDX-License-Identifier: BUSL-1.1 - apiVersion: v1 kind: ServiceAccount metadata: @@ -32,12 +29,10 @@ spec: replicas: {{ .Values.controllerManager.replicas }} selector: matchLabels: - app.kubernetes.io/name: mondoo-operator {{- include "mondoo-operator.selectorLabels" . | nindent 6 }} template: metadata: labels: - app.kubernetes.io/name: mondoo-operator {{- include "mondoo-operator.selectorLabels" . | nindent 8 }} annotations: kubectl.kubernetes.io/default-container: manager diff --git a/charts/mondoo-operator/templates/k8s-resources-scanning-rbac.yaml b/charts/mondoo-operator/templates/k8s-resources-scanning-rbac.yaml index 62c433145..a70d7069d 100644 --- a/charts/mondoo-operator/templates/k8s-resources-scanning-rbac.yaml +++ b/charts/mondoo-operator/templates/k8s-resources-scanning-rbac.yaml @@ -1,6 +1,3 @@ -# Copyright (c) Mondoo, Inc. -# SPDX-License-Identifier: BUSL-1.1 - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/charts/mondoo-operator/templates/leader-election-rbac.yaml b/charts/mondoo-operator/templates/leader-election-rbac.yaml index 853a4612e..42587c4a6 100644 --- a/charts/mondoo-operator/templates/leader-election-rbac.yaml +++ b/charts/mondoo-operator/templates/leader-election-rbac.yaml @@ -1,6 +1,3 @@ -# Copyright (c) Mondoo, Inc. -# SPDX-License-Identifier: BUSL-1.1 - apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: diff --git a/charts/mondoo-operator/templates/metrics-service.yaml b/charts/mondoo-operator/templates/metrics-service.yaml index 2d26222bb..2ffe9f1c9 100644 --- a/charts/mondoo-operator/templates/metrics-service.yaml +++ b/charts/mondoo-operator/templates/metrics-service.yaml @@ -1,6 +1,3 @@ -# Copyright (c) Mondoo, Inc. -# SPDX-License-Identifier: BUSL-1.1 - apiVersion: v1 kind: Service metadata: diff --git a/charts/mondoo-operator/templates/mondooauditconfig-crd.yaml b/charts/mondoo-operator/templates/mondooauditconfig-crd.yaml index 2da1d9f78..8ecd40c45 100644 --- a/charts/mondoo-operator/templates/mondooauditconfig-crd.yaml +++ b/charts/mondoo-operator/templates/mondooauditconfig-crd.yaml @@ -1,6 +1,3 @@ -# Copyright (c) Mondoo, Inc. -# SPDX-License-Identifier: BUSL-1.1 - apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/mondoo-operator/templates/mondoooperatorconfig-crd.yaml b/charts/mondoo-operator/templates/mondoooperatorconfig-crd.yaml index 08e5c15c0..07ad78e29 100644 --- a/charts/mondoo-operator/templates/mondoooperatorconfig-crd.yaml +++ b/charts/mondoo-operator/templates/mondoooperatorconfig-crd.yaml @@ -1,6 +1,3 @@ -# Copyright (c) Mondoo, Inc. -# SPDX-License-Identifier: BUSL-1.1 - apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/mondoo-operator/values.yaml b/charts/mondoo-operator/values.yaml index f28011e19..c2595537c 100644 --- a/charts/mondoo-operator/values.yaml +++ b/charts/mondoo-operator/values.yaml @@ -27,6 +27,8 @@ controllerManager: kubernetesClusterDomain: cluster.local managerConfig: controllerManagerConfigYaml: |- + # Copyright (c) Mondoo, Inc. + # SPDX-License-Identifier: BUSL-1.1 apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 kind: ControllerManagerConfig health: diff --git a/config/manifests/bases/mondoo-operator.clusterserviceversion.yaml b/config/manifests/bases/mondoo-operator.clusterserviceversion.yaml index bf5e6c261..cbae0de30 100644 --- a/config/manifests/bases/mondoo-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/mondoo-operator.clusterserviceversion.yaml @@ -1,6 +1,3 @@ -# Copyright (c) Mondoo, Inc. -# SPDX-License-Identifier: BUSL-1.1 - apiVersion: operators.coreos.com/v1alpha1 kind: ClusterServiceVersion metadata: diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index b05dc294f..1726ff805 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -1,6 +1,3 @@ -# Copyright (c) Mondoo, Inc. -# SPDX-License-Identifier: BUSL-1.1 - --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index 38a313aa8..a01634a47 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -1,6 +1,3 @@ -# Copyright (c) Mondoo, Inc. -# SPDX-License-Identifier: BUSL-1.1 - --- apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration From 04dab41002121a25cbc1acbd11978801a2d2b6c0 Mon Sep 17 00:00:00 2001 From: Ivan Milchev Date: Tue, 26 Sep 2023 09:13:06 +0300 Subject: [PATCH 4/5] ignore manifests for copywright Signed-off-by: Ivan Milchev --- .copywrite.hcl | 1 + 1 file changed, 1 insertion(+) diff --git a/.copywrite.hcl b/.copywrite.hcl index 536f4622e..7e4b21b95 100644 --- a/.copywrite.hcl +++ b/.copywrite.hcl @@ -14,5 +14,6 @@ project { "**/*.pb.go", "**/*_string.go", "charts/mondoo-operator/**", + "config/**/*.yaml", ] } \ No newline at end of file From 5d6727ee247ef448143ce7c165cab3ed72ce2218 Mon Sep 17 00:00:00 2001 From: Ivan Milchev Date: Tue, 26 Sep 2023 10:07:58 +0300 Subject: [PATCH 5/5] remove license from yaml Signed-off-by: Ivan Milchev --- charts/mondoo-operator/values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/mondoo-operator/values.yaml b/charts/mondoo-operator/values.yaml index c2595537c..f28011e19 100644 --- a/charts/mondoo-operator/values.yaml +++ b/charts/mondoo-operator/values.yaml @@ -27,8 +27,6 @@ controllerManager: kubernetesClusterDomain: cluster.local managerConfig: controllerManagerConfigYaml: |- - # Copyright (c) Mondoo, Inc. - # SPDX-License-Identifier: BUSL-1.1 apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 kind: ControllerManagerConfig health: