chore: switch from an unmaintained kubectl image to the Bitnami one (#…

…125)

* chore: switch from an unmaintained kubectl image to the bitnami one

* chore: add the new ZK app to the CVE scanning whitelist

* fix: remove an unrelated trailing whitespace to make pre-commit happy

* chore: remove images used by the old apps from the bundle

hack/cve/whitelist.yaml

@@ -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.15
+- zookeeper-0.2.15-dkp.1
 - kafka-0.25.1

hack/images.yaml

@@ -4,8 +4,7 @@ kafka-0.25.1:
   - "ghcr.io/banzaicloud/kafka:2.13-3.1.2"
   - "ghcr.io/banzaicloud/jmx-javaagent:0.16.1"
   - "gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1"
-zookeeper-0.2.15:
+zookeeper-0.2.15-dkp.1:
   - "docker.io/pravega/zookeeper-operator:0.2.15"
   - "docker.io/pravega/zookeeper:0.2.15"
-  - "docker.io/pravega/zookeeper:0.2.14"
-  - "docker.io/lachlanevenson/k8s-kubectl:v1.25.4"
+  - "docker.io/bitnami/kubectl:1.27.6"

licenses.d2iq.yaml

@@ -1,19 +1,11 @@
+ignore:
+  - docker.io/bitnami/kubectl:1.27.6
 resources:
-  - container_image: docker.io/lachlanevenson/k8s-kubectl:v1.25.4
-    sources:
-      - url: https://github.com/lachie83/k8s-kubectl
-        ref: ${image_tag}
-        license_path: LICENSE
   - container_image: docker.io/pravega/zookeeper-operator:0.2.15
     sources:
       - url: https://github.com/pravega/zookeeper-operator
         ref: v${image_tag}
         license_path: LICENSE
-  - container_image: docker.io/pravega/zookeeper:0.2.14
-    sources:
-      - url: https://github.com/pravega/zookeeper-operator
-        ref: v${image_tag}
-        license_path: LICENSE
   - container_image: docker.io/pravega/zookeeper:0.2.15
     sources:
       - url: https://github.com/pravega/zookeeper-operator

make/release.mk

@@ -32,7 +32,7 @@ release.whitelisted-images:
 
 .PHONY: cve-reporter.push-images
 cve-reporter.push-images: $(GOJQ_BIN)
-cve-reporter.push-images: release.whitelisted-images 
+cve-reporter.push-images: release.whitelisted-images
 cve-reporter.push-images: CVE_REPORTER_PROJECT_VERSION ?= main
 cve-reporter.push-images:
 	$(call print-target)

services/zookeeper-operator/0.2.15-dkp.1/defaults/cm.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: zookeeper-operator-0.2.15-dkp.1-d2iq-defaults
+  namespace: ${releaseNamespace}
+data:
+  values.yaml: |
+    ---
+    hooks:
+      image:
+        repository: bitnami/kubectl
+        tag: 1.27.6

services/zookeeper-operator/0.2.15-dkp.1/defaults/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - cm.yaml

services/zookeeper-operator/0.2.15-dkp.1/kustomization.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - zookeeper-operator.yaml
+  - ../../../helm-repositories/pravega

services/zookeeper-operator/0.2.15-dkp.1/metadata.yaml

@@ -0,0 +1 @@
+k8sVersionSupport: ">=1.21"

services/zookeeper-operator/0.2.15-dkp.1/zookeeper-operator.yaml

@@ -0,0 +1,28 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: zookeeper-operator
+  namespace: ${releaseNamespace}
+spec:
+  chart:
+    spec:
+      chart: zookeeper-operator
+      sourceRef:
+        kind: HelmRepository
+        name: charts.pravega.io
+        namespace: ${workspaceNamespace}
+      version: 0.2.15
+  interval: 15s
+  install:
+    remediation:
+      retries: 30
+    createNamespace: true
+  upgrade:
+    remediation:
+      retries: 30
+  releaseName: zookeeper-operator
+  valuesFrom:
+    - kind: ConfigMap
+      name: zookeeper-operator-0.2.15-dkp.1-d2iq-defaults
+  targetNamespace: ${releaseNamespace}