From e701c1afb7eb331c72bba4ac75cba8b1d34bc4c2 Mon Sep 17 00:00:00 2001
From: mbussolotto <michele.bussolotto@suse.com>
Date: Tue, 21 May 2024 11:43:31 +0200
Subject: [PATCH] squid and apache conf in k8s

---
 containers/proxy-helm/templates/config.yaml     |  6 ++++++
 containers/proxy-helm/templates/deployment.yaml | 12 ++++++++++++
 containers/proxy-helm/values.yaml               |  3 +++
 3 files changed, 21 insertions(+)

diff --git a/containers/proxy-helm/templates/config.yaml b/containers/proxy-helm/templates/config.yaml
index ca0209e579ec..988f68cefc75 100644
--- a/containers/proxy-helm/templates/config.yaml
+++ b/containers/proxy-helm/templates/config.yaml
@@ -13,6 +13,12 @@ data:
     log_level: {{ .Values.log_level | default 1 }}
     ca_crt: |
 {{ .Values.ca_crt | indent 6 }}
+  squid_tuning: |
+    # Add your Squid tuning configuration here
+{{ .Values.squid_tuning | indent 4 }}
+  apache_tuning: |
+    # Add your Apache tuning configuration here
+{{ .Values.apache_tuning | indent 4 }}
 ---
 apiVersion: v1
 kind: Secret
diff --git a/containers/proxy-helm/templates/deployment.yaml b/containers/proxy-helm/templates/deployment.yaml
index d151fe7d1d73..eb7fd1fa2d60 100644
--- a/containers/proxy-helm/templates/deployment.yaml
+++ b/containers/proxy-helm/templates/deployment.yaml
@@ -32,6 +32,10 @@ spec:
             mountPath: /var/cache/rhn
           - name: tftp-boot
             mountPath: /srv/tftpboot
+          - name: config-volume
+            mountPath: /etc/apache2/apache_tuning.conf
+            subPath:  apache_tuning
+            readOnly: true
           ports:
             - containerPort: 80
             - containerPort: 443
@@ -56,6 +60,10 @@ spec:
             readOnly: true
           - name: squid-cache
             mountPath: /var/cache/squid
+          - name: config-volume
+            mountPath: /etc/squid/squid_tuning.conf
+            subPath:  squid_tuning
+            readOnly: true
           ports:
             - containerPort: 8088
         - name: ssh
@@ -93,6 +101,10 @@ spec:
             items:
               - key: config.yaml
                 path: config.yaml
+              - key: squid_tuning
+                path: squid_tuning
+              - key: apache_tuning
+                path: apache_tuning
         - name: httpd-secret-volume
           secret:
             secretName: proxy-secret
diff --git a/containers/proxy-helm/values.yaml b/containers/proxy-helm/values.yaml
index 13823001cd6b..0bb54e938205 100644
--- a/containers/proxy-helm/values.yaml
+++ b/containers/proxy-helm/values.yaml
@@ -61,3 +61,6 @@ services:
     nodeport_saltb: 32506
     nodeport_ssh:   30020
     nodeport_tfpt:  30069
+
+squid_tuning: ""
+apache_tuning: ""