Skip to content

Commit

Permalink
Mondoo operator 1.15.2 (#847)
Browse files Browse the repository at this point in the history
* mondoo-operator-1.15.2

Signed-off-by: Christian Zunker <[email protected]>
  • Loading branch information
czunker authored Aug 21, 2023
1 parent 0c1d20d commit 39f3398
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions charts/mondoo-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 0 additions & 2 deletions charts/mondoo-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion charts/mondoo-operator/templates/metrics-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
2 changes: 1 addition & 1 deletion charts/mondoo-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ kind: Kustomization
images:
- name: controller
newName: ghcr.io/mondoohq/mondoo-operator
newTag: v1.15.1
newTag: v1.15.2
2 changes: 1 addition & 1 deletion config/webhook/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ resources:
images:
- name: controller
newName: ghcr.io/mondoohq/mondoo-operator
newTag: v1.15.1
newTag: v1.15.2

0 comments on commit 39f3398

Please sign in to comment.