From 7f90f83aa33eff71a68f578f8e023b63b9aa8009 Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Fri, 5 Sep 2025 19:46:14 +0100 Subject: [PATCH] Remove pv creation using files PV creation is handling using the storageclass smo-storage. This change removes file based PV creation and utilize the storageclass properties. Issue-ID: NONRTRIC-1082 Change-Id: Ied290e8b19a85450f64463d970aeff49e42fcb2a Signed-off-by: aravind.est --- .../oran_oom/kong/templates/00-kong-pv.yaml | 34 -------------------- .../oran_oom/kong/templates/01-kongpvc.yaml | 1 - smo-install/oran_oom/kong/values.yaml | 4 --- smo-install/oran_oom/nonrtric/templates/pv1.yaml | 35 --------------------- smo-install/oran_oom/nonrtric/templates/pv2.yaml | 36 ---------------------- .../oran_oom/smo/smo/templates/pgsql-pv.yaml | 30 ------------------ smo-install/oran_oom/smo/smo/values.yaml | 5 --- .../smo/topology-exposure-inventory/values.yaml | 1 - 8 files changed, 146 deletions(-) delete mode 100644 smo-install/oran_oom/kong/templates/00-kong-pv.yaml delete mode 100644 smo-install/oran_oom/nonrtric/templates/pv1.yaml delete mode 100644 smo-install/oran_oom/nonrtric/templates/pv2.yaml delete mode 100644 smo-install/oran_oom/smo/smo/templates/pgsql-pv.yaml diff --git a/smo-install/oran_oom/kong/templates/00-kong-pv.yaml b/smo-install/oran_oom/kong/templates/00-kong-pv.yaml deleted file mode 100644 index 30b29938..00000000 --- a/smo-install/oran_oom/kong/templates/00-kong-pv.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# ============LICENSE_START=============================================== -# Copyright (C) 2024-2025 OpenInfra Foundation Europe. 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. -# ============LICENSE_END================================================= -# - -{{- if .Values.kongpv.enabled }} -apiVersion: v1 -kind: PersistentVolume -metadata: - name: kongpv - labels: - type: local -spec: - capacity: - storage: "{{ .Values.kongpv.persistence.size }}" - accessModes: - - "{{ .Values.kongpv.persistence.accessMode }}" - hostPath: - path: "{{ .Values.kongpv.persistence.path }}" - storageClassName: {{ .Values.kongpv.persistence.storageClassName }} - persistentVolumeReclaimPolicy: "{{ .Values.kongpv.persistence.volumeReclaimPolicy }}" -{{- end }} diff --git a/smo-install/oran_oom/kong/templates/01-kongpvc.yaml b/smo-install/oran_oom/kong/templates/01-kongpvc.yaml index 5972d638..b6490a66 100644 --- a/smo-install/oran_oom/kong/templates/01-kongpvc.yaml +++ b/smo-install/oran_oom/kong/templates/01-kongpvc.yaml @@ -25,6 +25,5 @@ spec: requests: storage: "{{ .Values.kongpvc.persistence.size }}" {{- if .Values.kongpv.enabled }} - volumeName: kongpv storageClassName: {{ .Values.kongpv.persistence.storageClassName }} {{- end }} diff --git a/smo-install/oran_oom/kong/values.yaml b/smo-install/oran_oom/kong/values.yaml index a9be33c3..71ca5c4c 100644 --- a/smo-install/oran_oom/kong/values.yaml +++ b/smo-install/oran_oom/kong/values.yaml @@ -20,10 +20,6 @@ kongpv: enabled: true # Disabled for Minikube persistence: - volumeReclaimPolicy: Delete - accessMode: ReadWriteOnce - size: 2Gi - path: "/tmp/kongpv" storageClassName: kong-storage kongpvc: diff --git a/smo-install/oran_oom/nonrtric/templates/pv1.yaml b/smo-install/oran_oom/nonrtric/templates/pv1.yaml deleted file mode 100644 index 25440720..00000000 --- a/smo-install/oran_oom/nonrtric/templates/pv1.yaml +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################### -# Copyright (c) 2021 Nordix Foundation. # -# # -# 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. # -################################################################################ - -{{- if .Values.nonrtric.volume1.size }} - -kind: PersistentVolume -apiVersion: v1 -metadata: - name: nonrtric-pv1 - namespace: {{ include "common.namespace" . }} -spec: - capacity: - storage: {{ .Values.nonrtric.volume1.size}} - accessModes: - - ReadWriteOnce - - ReadWriteMany - persistentVolumeReclaimPolicy: Retain - hostPath: - path: {{ .Values.nonrtric.persistence.mountPath }}/nonrtric/volume1 - storageClassName: {{ .Values.nonrtric.volume1.storageClassName }} - -{{- end }} diff --git a/smo-install/oran_oom/nonrtric/templates/pv2.yaml b/smo-install/oran_oom/nonrtric/templates/pv2.yaml deleted file mode 100644 index 50ff421f..00000000 --- a/smo-install/oran_oom/nonrtric/templates/pv2.yaml +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2021 Nordix Foundation. # -# # -# 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. # -################################################################################ - -{{- if .Values.nonrtric.volume2.size }} - -kind: PersistentVolume -apiVersion: v1 -metadata: - name: nonrtric-pv2 - namespace: {{ include "common.namespace" . }} -spec: - capacity: - storage: {{ .Values.nonrtric.volume2.size }} - accessModes: - - ReadWriteOnce - - ReadWriteMany - persistentVolumeReclaimPolicy: Retain - hostPath: - path: {{ .Values.nonrtric.persistence.mountPath }}/nonrtric/volume2 - storageClassName: {{ .Values.nonrtric.volume2.storageClassName }} - -{{- end }} - diff --git a/smo-install/oran_oom/smo/smo/templates/pgsql-pv.yaml b/smo-install/oran_oom/smo/smo/templates/pgsql-pv.yaml deleted file mode 100644 index f8c999ff..00000000 --- a/smo-install/oran_oom/smo/smo/templates/pgsql-pv.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# ============LICENSE_START=============================================== -# Copyright (C) 2024 OpenInfra Foundation Europe. 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. -# ============LICENSE_END================================================= -# -kind: PersistentVolume -apiVersion: v1 -metadata: - name: pgsql-volume -spec: - capacity: - storage: {{ .Values.smo.pgsqlvolume.size}} - accessModes: - - ReadWriteOnce - - ReadWriteMany - persistentVolumeReclaimPolicy: Retain - hostPath: - path: {{ .Values.smo.persistence.mountPath }}/smo/pgsql-volume - storageClassName: {{ .Values.smo.pgsqlvolume.storageClassName }} \ No newline at end of file diff --git a/smo-install/oran_oom/smo/smo/values.yaml b/smo-install/oran_oom/smo/smo/values.yaml index e99f330e..e26e76e9 100644 --- a/smo-install/oran_oom/smo/smo/values.yaml +++ b/smo-install/oran_oom/smo/smo/values.yaml @@ -16,11 +16,6 @@ smo: installTeiv: true - persistence: - mountPath: /dockerdata-nfs - pgsqlvolume: - size: 1Gi - storageClassName: pgsql-sc common: enabled: true diff --git a/smo-install/oran_oom/smo/topology-exposure-inventory/values.yaml b/smo-install/oran_oom/smo/topology-exposure-inventory/values.yaml index 9805b5b2..f45e6e25 100644 --- a/smo-install/oran_oom/smo/topology-exposure-inventory/values.yaml +++ b/smo-install/oran_oom/smo/topology-exposure-inventory/values.yaml @@ -46,7 +46,6 @@ postgresql: password: teiv persistence: size: 1Gi - volumeName: pgsql-volume storageClass: pgsql-sc topology-exposure: -- 2.16.6