From e8499cffe924c1d0671bd234346da29e8129febc Mon Sep 17 00:00:00 2001 From: Amir Malka Date: Tue, 21 Nov 2023 14:49:29 +0200 Subject: [PATCH 1/2] bump component version with support for service discovery v2 Signed-off-by: Amir Malka --- .../templates/servicediscovery/job.yaml | 2 +- .../tests/__snapshot__/snapshot_test.yaml.snap | 12 ++++++------ charts/kubescape-operator/values.yaml | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/kubescape-operator/templates/servicediscovery/job.yaml b/charts/kubescape-operator/templates/servicediscovery/job.yaml index ca9db30b..38c49e54 100644 --- a/charts/kubescape-operator/templates/servicediscovery/job.yaml +++ b/charts/kubescape-operator/templates/servicediscovery/job.yaml @@ -48,7 +48,7 @@ spec: - -method=get - -scheme=https - -host={{ .Values.server }} - - -path=api/v1/servicediscovery + - -path=api/v2/servicediscovery - -path-output=/data/services.json volumeMounts: - name: shared-data diff --git a/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap b/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap index 5d9db6f6..f843638a 100644 --- a/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap +++ b/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap @@ -236,7 +236,7 @@ matches the snapshot: name: cloud-secret - name: OTEL_COLLECTOR_SVC value: otel-collector:4317 - image: quay.io/kubescape/gateway:v0.1.17 + image: quay.io/kubescape/gateway:v0.1.20 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -595,7 +595,7 @@ matches the snapshot: value: "false" - name: WAIT_BEFORE_REPORT value: "0" - image: quay.io/kubescape/kollector:v0.1.29 + image: quay.io/kubescape/kollector:v0.1.33 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -994,7 +994,7 @@ matches the snapshot: name: cloud-secret - name: OTEL_COLLECTOR_SVC value: otel-collector:4317 - image: quay.io/kubescape/kubescape:v3.0.1 + image: quay.io/kubescape/kubescape:v3.0.2-prerelease imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -1449,7 +1449,7 @@ matches the snapshot: name: cloud-secret - name: OTEL_COLLECTOR_SVC value: otel-collector:4317 - image: quay.io/kubescape/kubevuln:v0.2.129 + image: quay.io/kubescape/kubevuln:v0.2.133 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -1983,7 +1983,7 @@ matches the snapshot: value: zap - name: OTEL_COLLECTOR_SVC value: otel-collector:4317 - image: quay.io/kubescape/operator:v0.1.61 + image: quay.io/kubescape/operator:v0.1.64 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -2431,7 +2431,7 @@ matches the snapshot: - -method=get - -scheme=https - -host=api.armosec.io - - -path=api/v1/servicediscovery + - -path=api/v2/servicediscovery - -path-output=/data/services.json env: null image: quay.io/kubescape/http-request:v0.2.2 diff --git a/charts/kubescape-operator/values.yaml b/charts/kubescape-operator/values.yaml index bc5f504f..aecf4b3a 100644 --- a/charts/kubescape-operator/values.yaml +++ b/charts/kubescape-operator/values.yaml @@ -182,7 +182,7 @@ kubescape: image: # -- source code: https://github.com/kubescape/kubescape/tree/master/httphandler (public repo) repository: quay.io/kubescape/kubescape - tag: v3.0.1 + tag: v3.0.2-prerelease pullPolicy: IfNotPresent resources: @@ -245,7 +245,7 @@ operator: image: # -- source code: https://github.com/kubescape/operator repository: quay.io/kubescape/operator - tag: v0.1.61 + tag: v0.1.64 pullPolicy: IfNotPresent service: @@ -325,7 +325,7 @@ kubevuln: image: # -- source code: https://github.com/kubescape/kubevuln repository: quay.io/kubescape/kubevuln - tag: v0.2.129 + tag: v0.2.133 pullPolicy: IfNotPresent replicaCount: 1 @@ -373,7 +373,7 @@ kollector: image: # -- source code: https://github.com/kubescape/kollector repository: quay.io/kubescape/kollector - tag: v0.1.29 + tag: v0.1.33 pullPolicy: IfNotPresent replicaCount: 1 @@ -424,7 +424,7 @@ gateway: image: # -- source code: https://github.com/kubescape/gateway repository: quay.io/kubescape/gateway - tag: v0.1.17 + tag: v0.1.20 pullPolicy: IfNotPresent replicaCount: 1 From 251a059a12d7fd658b9bcf188fdebf3943960f63 Mon Sep 17 00:00:00 2001 From: Amir Malka Date: Tue, 21 Nov 2023 15:47:31 +0200 Subject: [PATCH 2/2] bump storage Signed-off-by: Amir Malka --- .../tests/__snapshot__/snapshot_test.yaml.snap | 2 +- charts/kubescape-operator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap b/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap index f843638a..30673f27 100644 --- a/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap +++ b/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap @@ -2611,7 +2611,7 @@ matches the snapshot: name: cloud-secret - name: OTEL_COLLECTOR_SVC value: otel-collector:4317 - image: quay.io/kubescape/storage:v0.0.33 + image: quay.io/kubescape/storage:v0.0.39 imagePullPolicy: IfNotPresent name: apiserver resources: diff --git a/charts/kubescape-operator/values.yaml b/charts/kubescape-operator/values.yaml index aecf4b3a..2b37d2ca 100644 --- a/charts/kubescape-operator/values.yaml +++ b/charts/kubescape-operator/values.yaml @@ -563,7 +563,7 @@ storage: replicaCount: 1 image: repository: quay.io/kubescape/storage - tag: v0.0.33 + tag: v0.0.39 pullPolicy: IfNotPresent # image for init container