Merge branch 'main' into specified-nodeport-to-service

This commit is contained in:
Christian Hopf 2025-04-06 11:16:34 +02:00 committed by GitHub
commit b22c7f156b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 36 additions and 34 deletions

View File

@ -13,7 +13,7 @@ on:
jobs: jobs:
label-issues: label-issues:
uses: ckotzbauer/actions-toolkit/.github/workflows/toolkit-label-issues.yml@0.45.1 uses: ckotzbauer/actions-toolkit/.github/workflows/toolkit-label-issues.yml@0.47.0
secrets: secrets:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}

View File

@ -15,10 +15,10 @@ jobs:
uses: azure/setup-helm@v3.5 uses: azure/setup-helm@v3.5
- name: Setup Python - name: Setup Python
uses: ckotzbauer/actions-toolkit/setup-python@0.45.1 uses: ckotzbauer/actions-toolkit/setup-python@0.47.0
- name: Set up chart-testing - name: Set up chart-testing
uses: helm/chart-testing-action@v2.6.1 uses: helm/chart-testing-action@v2.7.0
- name: Run chart-testing (list-changed) - name: Run chart-testing (list-changed)
id: list-changed id: list-changed
@ -33,7 +33,7 @@ jobs:
- name: Create kind cluster - name: Create kind cluster
if: steps.list-changed.outputs.changed == 'true' if: steps.list-changed.outputs.changed == 'true'
uses: helm/kind-action@v1.10.0 uses: helm/kind-action@v1.12.0
with: with:
version: v0.22.0 version: v0.22.0

View File

@ -27,6 +27,6 @@ jobs:
helm repo add stable https://charts.helm.sh/stable helm repo add stable https://charts.helm.sh/stable
- name: Run chart-releaser - name: Run chart-releaser
uses: helm/chart-releaser-action@v1.6.0 uses: helm/chart-releaser-action@v1.7.0
env: env:
CR_TOKEN: "${{ secrets.CR_TOKEN }}" CR_TOKEN: "${{ secrets.CR_TOKEN }}"

View File

@ -5,7 +5,7 @@ on:
jobs: jobs:
size-label: size-label:
uses: ckotzbauer/actions-toolkit/.github/workflows/toolkit-size-label.yml@0.45.1 uses: ckotzbauer/actions-toolkit/.github/workflows/toolkit-size-label.yml@0.47.0
secrets: secrets:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}

View File

@ -5,6 +5,6 @@ on:
jobs: jobs:
stale: stale:
uses: ckotzbauer/actions-toolkit/.github/workflows/toolkit-stale.yml@0.45.1 uses: ckotzbauer/actions-toolkit/.github/workflows/toolkit-stale.yml@0.47.0
secrets: secrets:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}

View File

@ -41,6 +41,9 @@ helm.sh/chart: {{ include "cadvisor.chart" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }} {{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.commonLabels }}
{{ toYaml .Values.commonLabels }}
{{- end }}
{{- end -}} {{- end -}}
{{/* {{/*

View File

@ -4,6 +4,8 @@ kind: ClusterRole
metadata: metadata:
name: {{ template "cadvisor.name" . }} name: {{ template "cadvisor.name" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels:
{{- include "cadvisor.labels" . | nindent 4}}
rules: rules:
- apiGroups: ['policy'] - apiGroups: ['policy']
resources: ['podsecuritypolicies'] resources: ['podsecuritypolicies']

View File

@ -4,6 +4,8 @@ kind: ClusterRoleBinding
metadata: metadata:
name: {{ template "cadvisor.name" . }} name: {{ template "cadvisor.name" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels:
{{- include "cadvisor.labels" . | nindent 4}}
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole

View File

@ -8,20 +8,15 @@ metadata:
{{ toYaml . | indent 4 }} {{ toYaml . | indent 4 }}
{{- end }} {{- end }}
labels: labels:
app: {{ template "cadvisor.name" . }} {{- include "cadvisor.labels" . | nindent 4}}
chart: {{ template "cadvisor.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
app: {{ template "cadvisor.name" . }} {{- include "cadvisor.selectorLabels" . | nindent 6 }}
release: {{ .Release.Name }}
template: template:
metadata: metadata:
labels: labels:
app: {{ template "cadvisor.name" . }} {{- include "cadvisor.selectorLabels" . | nindent 8 }}
release: {{ .Release.Name }}
{{- range $key, $value := .Values.podLabels }} {{- range $key, $value := .Values.podLabels }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}
{{- end }} {{- end }}
@ -30,17 +25,17 @@ spec:
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}
{{- end }} {{- end }}
spec: spec:
{{ if .Values.priorityClassName }} {{- if .Values.priorityClassName }}
priorityClassName: {{ .Values.priorityClassName }} priorityClassName: {{ .Values.priorityClassName }}
{{- end }} {{- end }}
{{ if .Values.image.pullSecrets }} {{- if .Values.image.pullSecrets }}
imagePullSecrets: imagePullSecrets:
{{- range .Values.image.pullSecrets }} {{- range .Values.image.pullSecrets }}
- name: {{ . }} - name: {{ . }}
{{- end }} {{- end }}
{{- end }} {{- end }}
serviceAccountName: {{ template "cadvisor.serviceAccountName" . }} serviceAccountName: {{ template "cadvisor.serviceAccountName" . }}
{{ if .Values.hostNetwork }} {{- if .Values.hostNetwork }}
hostNetwork: true hostNetwork: true
{{- end }} {{- end }}
containers: containers:
@ -57,7 +52,7 @@ spec:
mountPath: {{ default .path .mount }} mountPath: {{ default .path .mount }}
readOnly: {{ list nil true | has .readOnly }} readOnly: {{ list nil true | has .readOnly }}
{{- end }} {{- end }}
{{ if .Values.podSecurityContext.create }} {{- if .Values.podSecurityContext.create }}
securityContext: securityContext:
privileged: {{ .Values.podSecurityContext.privileged }} privileged: {{ .Values.podSecurityContext.privileged }}
{{- end }} {{- end }}

View File

@ -4,6 +4,8 @@ kind: PodSecurityPolicy
metadata: metadata:
name: {{ template "cadvisor.name" . }} name: {{ template "cadvisor.name" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels:
{{- include "cadvisor.labels" . | nindent 4}}
spec: spec:
seLinux: seLinux:
rule: RunAsAny rule: RunAsAny

View File

@ -4,10 +4,7 @@ metadata:
name: {{ template "cadvisor.name" . }} name: {{ template "cadvisor.name" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: labels:
app: {{ template "cadvisor.name" . }} {{- include "cadvisor.labels" . | nindent 4}}
chart: {{ template "cadvisor.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec: spec:
ports: ports:
- name: http - name: http
@ -18,5 +15,5 @@ spec:
nodePort: {{ . }} nodePort: {{ . }}
{{- end }} {{- end }}
selector: selector:
app: {{ template "cadvisor.name" . }} {{- include "cadvisor.selectorLabels" . | nindent 4 }}
type: {{ .Values.service.type }} type: {{ .Values.service.type }}

View File

@ -4,4 +4,6 @@ kind: ServiceAccount
metadata: metadata:
name: {{ template "cadvisor.serviceAccountName" . }} name: {{ template "cadvisor.serviceAccountName" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels:
{{- include "cadvisor.labels" . | nindent 4 }}
{{- end -}} {{- end -}}

View File

@ -5,10 +5,7 @@ metadata:
name: {{ template "cadvisor.name" . }} name: {{ template "cadvisor.name" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: labels:
app: {{ template "cadvisor.name" . }} {{- include "cadvisor.labels" . | nindent 4}}
chart: {{ template "cadvisor.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
@ -30,3 +27,4 @@ spec:
{{- toYaml .Values.metrics.metricRelabelings | nindent 8 }} {{- toYaml .Values.metrics.metricRelabelings | nindent 8 }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

View File

@ -53,6 +53,7 @@ resources: {}
podAnnotations: {} podAnnotations: {}
podLabels: {} podLabels: {}
commonLabels: {}
daemonsetAnnotations: daemonsetAnnotations:
seccomp.security.alpha.kubernetes.io/pod: 'docker/default' seccomp.security.alpha.kubernetes.io/pod: 'docker/default'

View File

@ -1,8 +1,8 @@
apiVersion: v2 apiVersion: v2
description: Catalogue all images of a Kubernetes cluster to multiple targets with Syft description: Catalogue all images of a Kubernetes cluster to multiple targets with Syft
name: sbom-operator name: sbom-operator
version: 0.37.1 version: 0.38.0
appVersion: 0.36.0 appVersion: 0.37.0
home: https://github.com/ckotzbauer/sbom-operator home: https://github.com/ckotzbauer/sbom-operator
sources: sources:
- https://github.com/ckotzbauer/sbom-operator - https://github.com/ckotzbauer/sbom-operator

View File

@ -31,7 +31,7 @@ The following table lists the configurable parameters of the sbom-operator chart
| Parameter | Description | Default | | Parameter | Description | Default |
| -------------------------------------- | ------------------------------------------------- | ---------------------------------------- | | -------------------------------------- | ------------------------------------------------- | ---------------------------------------- |
| `image.repository` | container image repository | `ghcr.io/ckotzbauer/sbom-operator` | | `image.repository` | container image repository | `ghcr.io/ckotzbauer/sbom-operator` |
| `image.tag` | container image tag | `0.36.0` | | `image.tag` | container image tag | `0.37.0` |
| `image.pullPolicy` | container image pull policy | `IfNotPresent` | | `image.pullPolicy` | container image pull policy | `IfNotPresent` |
| `image.pullSecrets` | image pull-secrets | `[]` | | `image.pullSecrets` | image pull-secrets | `[]` |
| `args` | argument object for cli-args | `{}` | | `args` | argument object for cli-args | `{}` |

View File

@ -1,8 +1,8 @@
apiVersion: v2 apiVersion: v2
description: Scans SBOMs for vulnerabilities description: Scans SBOMs for vulnerabilities
name: vulnerability-operator name: vulnerability-operator
version: 0.28.1 version: 0.29.0
appVersion: 0.26.1 appVersion: 0.27.0
home: https://github.com/ckotzbauer/vulnerability-operator home: https://github.com/ckotzbauer/vulnerability-operator
sources: sources:
- https://github.com/ckotzbauer/vulnerability-operator - https://github.com/ckotzbauer/vulnerability-operator

View File

@ -31,7 +31,7 @@ The following table lists the configurable parameters of the vulnerability-opera
| Parameter | Description | Default | | Parameter | Description | Default |
| -------------------------------------- | ------------------------------------------------- | --------------------------------------------- | | -------------------------------------- | ------------------------------------------------- | --------------------------------------------- |
| `image.repository` | container image repository | `ghcr.io/ckotzbauer/vulnerability-operator` | | `image.repository` | container image repository | `ghcr.io/ckotzbauer/vulnerability-operator` |
| `image.tag` | container image tag | `0.26.1` | | `image.tag` | container image tag | `0.27.0` |
| `image.pullPolicy` | container image pull policy | `IfNotPresent` | | `image.pullPolicy` | container image pull policy | `IfNotPresent` |
| `args` | argument object for cli-args | `{}` | | `args` | argument object for cli-args | `{}` |
| `envVars` | environment variables | `{}` | | `envVars` | environment variables | `{}` |