diff --git a/Makefile b/Makefile index 13fba4442..fefd88f86 100644 --- a/Makefile +++ b/Makefile @@ -293,7 +293,7 @@ bundle: manifests kustomize ## Generate bundle manifests and metadata, then vali operator-sdk generate kustomize manifests -q cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) cd config/webhook && $(KUSTOMIZE) edit set image controller=${IMG} - $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle $(BUNDLE_GEN_FLAGS) + $(KUSTOMIZE) build config/manifests | operator-sdk generate --channels "stable-v1" bundle $(BUNDLE_GEN_FLAGS) sed -i -e 's|containerImage: .*|containerImage: $(IMG)|' bundle/manifests/*.clusterserviceversion.yaml # TODO: find a portable way to in-place sed edit a file between Linux/MacOS # MacOS sed requires a '-i""' to avoid making backup files when doing in-place edits, but that diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 02436bbc4..a11e62b57 100644 --- a/bundle.Dockerfile +++ b/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=stable-v1 -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.30.0 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4-alpha diff --git a/charts/mondoo-operator/Chart.yaml b/charts/mondoo-operator/Chart.yaml index 0df036122..a4fe72263 100755 --- a/charts/mondoo-operator/Chart.yaml +++ b/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: 1.15.1 +version: 1.15.2 # 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.1" +appVersion: "1.15.2" diff --git a/charts/mondoo-operator/templates/deployment.yaml b/charts/mondoo-operator/templates/deployment.yaml index ddfa0cadf..1b44ed237 100644 --- a/charts/mondoo-operator/templates/deployment.yaml +++ b/charts/mondoo-operator/templates/deployment.yaml @@ -29,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/metrics-service.yaml b/charts/mondoo-operator/templates/metrics-service.yaml index 8cff6e776..2ffe9f1c9 100644 --- a/charts/mondoo-operator/templates/metrics-service.yaml +++ b/charts/mondoo-operator/templates/metrics-service.yaml @@ -7,7 +7,6 @@ metadata: spec: type: {{ .Values.metricsService.type }} selector: - app.kubernetes.io/name: mondoo-operator {{- include "mondoo-operator.selectorLabels" . | nindent 4 }} ports: {{- .Values.metricsService.ports | toYaml | nindent 2 -}} \ No newline at end of file diff --git a/charts/mondoo-operator/values.yaml b/charts/mondoo-operator/values.yaml index d44b3624f..7b7908974 100644 --- a/charts/mondoo-operator/values.yaml +++ b/charts/mondoo-operator/values.yaml @@ -14,7 +14,7 @@ controllerManager: readOnlyRootFilesystem: true image: repository: ghcr.io/mondoohq/mondoo-operator - tag: v1.15.1 + tag: v1.15.2 imagePullPolicy: IfNotPresent resources: limits: diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 85cc11100..4ff1d6f6c 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -14,4 +14,4 @@ kind: Kustomization images: - name: controller newName: ghcr.io/mondoohq/mondoo-operator - newTag: v1.15.1 + newTag: v1.15.2 diff --git a/config/webhook/kustomization.yaml b/config/webhook/kustomization.yaml index 2061197d1..4bad1452e 100644 --- a/config/webhook/kustomization.yaml +++ b/config/webhook/kustomization.yaml @@ -7,4 +7,4 @@ resources: images: - name: controller newName: ghcr.io/mondoohq/mondoo-operator - newTag: v1.15.1 + newTag: v1.15.2