Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: cve fix for kafka and jmx-javaagent #145

Merged
merged 10 commits into from
Sep 18, 2024
2 changes: 1 addition & 1 deletion hack/cve/whitelist.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# List of applications that should be reported to CVE reporter. Apps in this list
# must match keys in /hack/images.yaml file.
- zookeeper-0.2.16-dkp.3
- kafka-0.25.1
- kafka-0.25.2
8 changes: 4 additions & 4 deletions hack/images.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
kafka-0.25.1:
kafka-0.25.2:
- "ghcr.io/banzaicloud/kafka-operator:v0.25.1"
- "ghcr.io/banzaicloud/cruise-control:2.5.123"
- "ghcr.io/banzaicloud/kafka:2.13-3.4.1"
- "ghcr.io/banzaicloud/jmx-javaagent:0.16.1"
- "ghcr.io/mesosphere/cruise-control:2.5.139"
- "ghcr.io/mesosphere/dkp-container-images/ghcr.io/banzaicloud/kafka:2.13-3.4.1-d2iq.1"
- "ghcr.io/mesosphere/jmx-javaagent:0.18.0"
- "gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1"
zookeeper-0.2.16-dkp.3:
- "ghcr.io/mesosphere/zookeeper-operator:0.2.15-d2iq"
Expand Down
6 changes: 3 additions & 3 deletions licenses.d2iq.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ resources:
- url: https://github.com/brancz/kube-rbac-proxy
ref: ${image_tag}
license_path: LICENSE
- container_image: ghcr.io/banzaicloud/cruise-control:2.5.123
- container_image: ghcr.io/mesosphere/cruise-control:2.5.139
sources:
- url: https://github.com/banzaicloud/docker-cruise-control
ref: ${image_tag}
license_path: LICENSE
- container_image: ghcr.io/banzaicloud/jmx-javaagent:0.16.1
- container_image: ghcr.io/mesosphere/jmx-javaagent:0.18.0
sources:
- url: https://github.com/banzaicloud/docker-jmx-exporter
ref: ${image_tag}
Expand All @@ -30,7 +30,7 @@ resources:
ref: ${image_tag}
license_path: LICENSE
notice_path: NOTICE
- container_image: ghcr.io/banzaicloud/kafka:2.13-3.4.1
- container_image: ghcr.io/mesosphere/dkp-container-images/ghcr.io/banzaicloud/kafka:2.13-3.4.1-d2iq.1
sources:
- url: https://github.com/banzaicloud/docker-kafka
ref: ${image_tag}
Expand Down
18 changes: 18 additions & 0 deletions services/kafka-operator/0.25.2/defaults/cm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
name: kafka-operator-0.25.2-d2iq-defaults
namespace: ${releaseNamespace}
data:
values.yaml: |
---
certManager:
enabled: true
crd:
enabled: true
prometheusMetrics:
authProxy:
image:
repository: gcr.io/kubebuilder/kube-rbac-proxy
tag: v0.14.1
4 changes: 4 additions & 0 deletions services/kafka-operator/0.25.2/defaults/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- cm.yaml
28 changes: 28 additions & 0 deletions services/kafka-operator/0.25.2/kafka-operator.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease
metadata:
name: kafka-operator
namespace: ${releaseNamespace}
spec:
chart:
spec:
chart: kafka-operator
sourceRef:
kind: HelmRepository
name: kubernetes-charts.banzaicloud.com
namespace: ${workspaceNamespace}
version: 0.25.1
interval: 15s
install:
remediation:
retries: 30
createNamespace: true
upgrade:
remediation:
retries: 30
releaseName: kafka-operator
valuesFrom:
- kind: ConfigMap
name: kafka-operator-0.25.2-d2iq-defaults
targetNamespace: ${releaseNamespace}
5 changes: 5 additions & 0 deletions services/kafka-operator/0.25.2/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- kafka-operator.yaml
- ../../../helm-repositories/banzaicloud
1 change: 1 addition & 0 deletions services/kafka-operator/0.25.2/metadata.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
k8sVersionSupport: ">=1.21"
Loading