From 4ef116d989547209c285bb55a62d02562ce842c5 Mon Sep 17 00:00:00 2001 From: srinivasyanamadala Date: Fri, 28 Mar 2025 08:48:54 +0100 Subject: [PATCH] Updated helm configuration for s3p tests for phase 2 Issue-ID: POLICY-5221 Change-Id: I84c2b2a71566ea93fc812aa7340e2d5d9e89a84e Signed-off-by: srinivasyanamadala --- .../policy-opa-pdp/resources/config/config.json | 18 +------- .../resources/policies/policy-data.tar.gz | Bin 30720 -> 0 bytes .../policy-opa-pdp/templates/configmap.yaml | 19 +-------- .../policy-opa-pdp/templates/deployment.yaml | 47 +++------------------ .../components/policy-opa-pdp/templates/pvc.yaml | 41 ------------------ 5 files changed, 9 insertions(+), 116 deletions(-) delete mode 100755 helm/policy/components/policy-opa-pdp/resources/policies/policy-data.tar.gz delete mode 100755 helm/policy/components/policy-opa-pdp/templates/pvc.yaml diff --git a/helm/policy/components/policy-opa-pdp/resources/config/config.json b/helm/policy/components/policy-opa-pdp/resources/config/config.json index f0adf0d2..8a3b9735 100755 --- a/helm/policy/components/policy-opa-pdp/resources/config/config.json +++ b/helm/policy/components/policy-opa-pdp/resources/config/config.json @@ -1,6 +1,6 @@ {{/* # ============LICENSE_START======================================================= -# Copyright (C) 2024 Deutsche Telekom Intellectual Property. All rights reserved. +# Copyright (C) 2024-2025 Deutsche Telekom Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,22 +21,6 @@ "logging": { "level": "debug" }, - "services": [ - { - "name": "opa-bundle-server", - "url": "http://policy-opa-pdp:8282/opa/bundles" - } - ], - "bundles": { - "opabundle": { - "service": "opa-bundle-server", - "resource": "bundle.tar.gz", - "polling": { - "min_delay_seconds": 60, - "max_delay_seconds": 120 - } - } - }, "decision_logs": { "console": true } diff --git a/helm/policy/components/policy-opa-pdp/resources/policies/policy-data.tar.gz b/helm/policy/components/policy-opa-pdp/resources/policies/policy-data.tar.gz deleted file mode 100755 index 572e96398b3597cce29283f54ee97f31f869cdf0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30720 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 diff --git a/helm/policy/components/policy-opa-pdp/templates/configmap.yaml b/helm/policy/components/policy-opa-pdp/templates/configmap.yaml index 36ad7cf4..96e2a6c7 100755 --- a/helm/policy/components/policy-opa-pdp/templates/configmap.yaml +++ b/helm/policy/components/policy-opa-pdp/templates/configmap.yaml @@ -1,6 +1,6 @@ {{/* # ============LICENSE_START======================================================= -# Copyright (C) 2024 Deutsche Telekom Intellectual Property. All rights reserved. +# Copyright (C) 2024-2025 Deutsche Telekom Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,23 +18,6 @@ # ============LICENSE_END========================================================= */}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Chart.Name }}-configmap-policies-data - namespace: default - labels: - app: {{ .Chart.Name }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: release - heritage: Helm - {{- with .Files.Glob "resources/policies/*" }} -binaryData: - {{- range $path, $bytes := . }} - {{ base $path }}: {{ $.Files.Get $path | b64enc | quote }} - {{- end }} - {{- end }} ---- apiVersion: v1 kind: ConfigMap metadata: diff --git a/helm/policy/components/policy-opa-pdp/templates/deployment.yaml b/helm/policy/components/policy-opa-pdp/templates/deployment.yaml index 2c5d8a6b..ece9dc3a 100755 --- a/helm/policy/components/policy-opa-pdp/templates/deployment.yaml +++ b/helm/policy/components/policy-opa-pdp/templates/deployment.yaml @@ -1,6 +1,6 @@ {{/* # ============LICENSE_START======================================================= -# Copyright (C) 2024 Deutsche Telekom Intellectual Property. All rights reserved. +# Copyright (C) 2024-2025 Deutsche Telekom Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,33 +40,9 @@ spec: release: release spec: initContainers: - - command: - - /bin/sh - args: - - -c - - | - echo "*** set right permissions to the different folders" - chown -R {{ .Values.permissions.uid }}:{{ .Values.permissions.gid }} /var/log; - chmod -R 755 /var/log - chown -R {{ .Values.permissions.uid }}:{{ .Values.permissions.gid }} /opt/; - chmod -R 755 /opt/* - tar -xvf /tmp/policies/policy-data.tar.gz -C /opt/ - image: busybox:latest - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - securityContext: - runAsUser: 1000 - runAsGroup: 1000 - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - name: {{ .Chart.Name }}-readiness - volumeMounts: - - name: logs - mountPath: /var/log - - name: tmp-policies-data - mountPath: /tmp/policies - - name : opa-policies-data - mountPath: /opt/ - + - name: {{ .Chart.Name }}-readiness + image: busybox + command: ["sh", "-c", "echo Init container started; sleep 10; echo Init container completed"] containers: - name: {{ .Chart.Name }} image: {{ .Values.global.repository }}/{{ .Values.global.image.opa }} @@ -97,13 +73,13 @@ spec: timeoutSeconds: {{ .Values.readiness.timeout }} env: - name: UseSASLForKAFKA - value: "{{ .Values.kafka.useSASL }}" + value: "{{ .Values.kafka.useSASL }}" - name: BOOSTSTRAP_SERVER value: "{{ .Values.kafka.brokers }}" - name: KAFKA_USERNAME value: "{{ .Values.kafka.username }}" - name: KAFKA_PASSWORD - value: "{{ .Values.kafka.password }}" + value: "{{ .Values.kafka.password }}" - name: LOG_LEVEL value: "{{ .Values.log.loglevel }}" - name: GROUPID @@ -111,14 +87,12 @@ spec: - name: TOPIC value: "{{ .Values.kafka.topic }}" volumeMounts: - - name: opa-policies-data - mountPath: /opt - name: opa-config mountPath: /app/config - name: opa-bundles mountPath: /app/bundles - name: logs - mountPath: /var/log + mountPath: /var/logs resources: {{ toYaml .Values.resources.small | indent 12 }} {{- if .Values.nodeSelector }} @@ -131,13 +105,6 @@ spec: {{- end }} serviceAccountName: {{ .Chart.Name }}-read volumes: - - name: tmp-policies-data - configMap: - name: {{ .Chart.Name }}-configmap-policies-data - defaultMode: 0755 - - name: opa-policies-data - persistentVolumeClaim: - claimName: {{ .Chart.Name }}-policies-data - name: opa-config configMap: name: {{ .Chart.Name }}-configmap-config diff --git a/helm/policy/components/policy-opa-pdp/templates/pvc.yaml b/helm/policy/components/policy-opa-pdp/templates/pvc.yaml deleted file mode 100755 index 6f0f7e1f..00000000 --- a/helm/policy/components/policy-opa-pdp/templates/pvc.yaml +++ /dev/null @@ -1,41 +0,0 @@ -{{/* -# ============LICENSE_START======================================================= -# Copyright (C) 2024 Deutsche Telekom Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -*/}} - - -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: {{ .Chart.Name }}-policies-data - namespace: default - labels: - app: {{ .Chart.Name }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: 13.0.1 - heritage: {{ .Release.Service }} -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 5G - storageClassName: microk8s-hostpath - volumeMode: Filesystem - - -- 2.16.6