chore(KFLUXVNGD-434): Consolidate squid-exporter containerfile to squid

Update the squid-exporter Containerfile to consolidate into
squid container image.

Jira-Url: https://issues.redhat.com/browse/KFLUXVNGD-434
Signed-off-by: Homaja Marisetty <[email protected]>
Assisted-by: Cursor

Author: hmariset

Containerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi10/ubi-minimal@sha256:5a57b4c2509df8df587e19cc7c2d9cfa45b012139f5decd77f942daeb2334228
+FROM registry.access.redhat.com/ubi10/ubi-minimal@sha256:5a57b4c2509df8df587e19cc7c2d9cfa45b012139f5decd77f942daeb2334228 AS squid-base
 
 ENV NAME="konflux-ci/squid"
 ENV SUMMARY="The Squid proxy caching server for Konflux CI"
@@ -41,6 +41,56 @@ RUN echo "pid_filename /run/squid/squid.pid" >> /etc/squid/squid.conf && \
     chown -R root:root /etc/squid/squid.conf /var/log/squid /var/spool/squid /run/squid && \
     chmod g=u /etc/squid/squid.conf /run/squid /var/spool/squid /var/log/squid
 
+# ==========================================
+# Stage 2: Build squid-exporter
+# ==========================================
+FROM registry.access.redhat.com/ubi10/ubi-minimal@sha256:5a57b4c2509df8df587e19cc7c2d9cfa45b012139f5decd77f942daeb2334228 AS squid-exporter-builder
+
+# Install required packages for Go build
+RUN microdnf install -y \
+    tar \
+    gzip \
+    gcc \
+    curl \
+    ca-certificates \
+    git && \
+    microdnf clean all
+
+# Install Go (version-locked)
+ARG GO_VERSION=1.24.4
+ARG GO_SHA256=77e5da33bb72aeaef1ba4418b6fe511bc4d041873cbf82e5aa6318740df98717
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" -o go.tar.gz && \
+    echo "${GO_SHA256}  go.tar.gz" | sha256sum -c - && \
+    tar -C /usr/local -xzf go.tar.gz && \
+    rm go.tar.gz
+
+# Set Go environment
+ENV PATH="/usr/local/go/bin:/root/go/bin:$PATH"
+ENV GOPATH="/root/go"
+ENV GOCACHE="/tmp/go-cache"
+
+# Set working directory for build
+WORKDIR /workspace
+
+# Install squid-exporter directly from upstream and copy to expected location
+RUN CGO_ENABLED=0 GOOS=linux go install github.com/boynux/[email protected] && \
+    cp /root/go/bin/squid-exporter /workspace/squid-exporter
+
+# ==========================================
+# Final Stage: Squid with integrated exporter
+# ==========================================
+FROM squid-base
+
+# Copy squid-exporter binary from builder stage
+COPY --from=squid-exporter-builder /workspace/squid-exporter /usr/local/bin/squid-exporter
+
+# Set permissions for squid-exporter
+RUN chmod +x /usr/local/bin/squid-exporter
+
+# Expose squid-exporter metrics port (only in final stage where the binary exists)
+EXPOSE 9301
+
 USER 1001
 
 ENTRYPOINT ["/usr/sbin/container-entrypoint.sh"]

README.md

@@ -78,7 +78,7 @@ mage all
 
 This single command will:
 - Create the 'caching' kind cluster (or connect to existing)
-- Build the squid container image
+- Build the consolidated squid container image (with integrated squid-exporter)
 - Load the image into the cluster
 - Deploy the Helm chart with all dependencies
 - Verify the deployment status
@@ -94,11 +94,9 @@ mage kind:status      # Check cluster status
 mage kind:down        # Remove cluster
 mage kind:upClean     # Force recreate cluster
 
-# Image management
-mage build:squid             # Build squid image
-mage build:squidExporter     # Build squid-exporter image
-mage build:loadSquid         # Load squid image into cluster
-mage build:loadSquidExporter # Load squid-exporter image into cluster
+# Image management  
+mage build:squid         # Build consolidated squid image (includes integrated squid-exporter)
+mage build:loadSquid     # Load squid image into cluster
 
 # Deployment management
 mage squidHelm:up     # Deploy/upgrade helm chart
@@ -288,7 +286,7 @@ When adding new tests:
 5. **Update VS Code config**: Add debug configurations for new test files
 ## Prometheus Monitoring
 
-This chart includes comprehensive Prometheus monitoring capabilities through the [squid-exporter](https://github.com/konflux-ci/squid-exporter) (forked from the original boynux implementation). The monitoring system provides detailed metrics about Squid's operational status, including:
+This chart includes comprehensive Prometheus monitoring capabilities through the integrated [squid-exporter](https://github.com/boynux/squid-exporter) (upstream). The squid-exporter is built into the main Squid container, providing a single, consolidated image. The monitoring system provides detailed metrics about Squid's operational status, including:
 
 - **Liveness**: Squid service information and connection status
 - **Bandwidth Usage**: Client HTTP and Server HTTP traffic metrics
@@ -398,16 +396,16 @@ curl http://squid.proxy.svc.cluster.local:9301/metrics
 
 #### No Metrics Appearing
 
-1. **Check if the exporter is running**:
+1. **Check if the squid container is running**:
    ```bash
    kubectl get pods -n proxy
-   kubectl logs -n proxy deployment/squid -c squid-exporter
+   kubectl logs -n proxy deployment/squid
    ```
 
 2. **Verify cache manager access**:
    ```bash
    # Test from within the pod
-   kubectl exec -n proxy deployment/squid -c squid-exporter -- \
+   kubectl exec -n proxy deployment/squid -- \
      curl -s http://localhost:3128/squid-internal-mgr/info
    ```
 
@@ -700,7 +698,7 @@ kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=squid -n proxy
 kubectl get pods -n proxy -o wide
 ```
 
-**Expected Result**: Pod shows `2/2 Running` (squid + squid-exporter containers).
+**Expected Result**: Pod shows `1/1 Running` (consolidated squid container with integrated exporter).
 
 ##### 2.3 Verify Service Creation
 ```bash
@@ -736,20 +734,17 @@ echo "Testing pod: $POD_NAME"
 kubectl get pod $POD_NAME -n proxy -o jsonpath='{.spec.containers[*].name}'
 ```
 
-**Expected Result**: Shows both `squid` and `squid-exporter` containers.
+**Expected Result**: Shows single `squid` container with integrated squid-exporter.
 
 ##### 3.2 Check Container Logs
 ```bash
-# Check squid container logs
-kubectl logs -n proxy $POD_NAME -c squid --tail=10
-
-# Check squid-exporter container logs
-kubectl logs -n proxy $POD_NAME -c squid-exporter --tail=10
+# Check consolidated squid container logs
+kubectl logs -n proxy $POD_NAME --tail=20
 ```
 
 **Expected Result**: 
 - Squid logs show successful startup with no permission errors
-- Squid-exporter logs show successful connection to cache manager
+- Squid-exporter startup messages show successful connection to cache manager
 
 #### 4. Metrics Endpoint Tests
 
@@ -901,10 +896,10 @@ kill $PF_METRICS_PID 2>/dev/null || true
 After completing all tests, verify:
 
 - [ ] **Deployment**: Chart installs successfully
-- [ ] **Containers**: Both squid and squid-exporter containers running
+- [ ] **Container**: Single consolidated squid container running with integrated exporter
 - [ ] **Service**: Ports 3128 and 9301 accessible
 - [ ] **ServiceMonitor**: Created (if Prometheus Operator available)
-- [ ] **Metrics**: squid-exporter provides Prometheus metrics
+- [ ] **Metrics**: Integrated squid-exporter provides Prometheus metrics
 - [ ] **Cache Manager**: Accessible via localhost manager interface
 - [ ] **Proxy**: Functions correctly for external requests
 - [ ] **Integration**: Metrics update after proxy usage
@@ -970,7 +965,6 @@ kind delete cluster --name caching
 ```bash
 # Remove the local container images
 podman rmi localhost/konflux-ci/squid:latest
-podman rmi localhost/konflux-ci/squid-exporter:latest
 podman rmi localhost/konflux-ci/squid-test:latest
 ```
 

magefile.go

@@ -33,10 +33,6 @@ const (
 	testImageTag = "localhost/konflux-ci/squid-test:latest"
 	// TestContainerfile is the path to the Containerfile for tests
 	testContainerfile = "test.Containerfile"
-	// SquidExporterImageTag is the tag used for the squid-exporter container image
-	squidExporterImageTag = "localhost/konflux-ci/squid-exporter:latest"
-	// SquidExporterContainerfile is the path to the Containerfile for squid-exporter
-	squidExporterContainerfile = "squid-exporter/Containerfile"
 )
 
 // Default target - shows available targets
@@ -275,52 +271,10 @@ func (Build) LoadTestImage() error {
 	return nil
 }
 
-// Build:SquidExporter builds the Squid Exporter container image
-func (Build) SquidExporter() error {
-	fmt.Println("📊 Building Squid Exporter container image...")
-
-	// Build the squid-exporter image using podman
-	fmt.Printf("📦 Building image with tag '%s'...\n", squidExporterImageTag)
-	err := sh.Run("podman", "build", "-t", squidExporterImageTag, "-f", squidExporterContainerfile, "squid-exporter")
-	if err != nil {
-		return fmt.Errorf("failed to build squid-exporter image: %w", err)
-	}
-
-	fmt.Printf("✅ Squid Exporter image built successfully\n")
-
-	// Verify the image was built
-	fmt.Printf("🔍 Verifying image exists...\n")
-	err = sh.Run("podman", "images", squidExporterImageTag)
-	if err != nil {
-		return fmt.Errorf("failed to verify squid-exporter image: %w", err)
-	}
-
-	fmt.Printf("✅ Squid Exporter image '%s' is ready!\n", squidExporterImageTag)
-	return nil
-}
-
-// Build:LoadSquidExporter loads the Squid Exporter image into the kind cluster
-func (Build) LoadSquidExporter() error {
-	// Ensure dependencies are met
-	mg.Deps(Kind.Up, Build.SquidExporter)
-
-	fmt.Println("📦 Loading Squid Exporter image into kind cluster...")
-
-	// Load image into kind cluster using process substitution
-	fmt.Printf("📤 Loading image into kind cluster '%s'...\n", clusterName)
-	err := sh.Run("bash", "-c", fmt.Sprintf("kind load image-archive --name %s <(podman save %s)", clusterName, squidExporterImageTag))
-	if err != nil {
-		return fmt.Errorf("failed to load squid-exporter image into kind cluster: %w", err)
-	}
-
-	fmt.Printf("✅ Squid Exporter image loaded successfully into kind cluster '%s'!\n", clusterName)
-	return nil
-}
-
 // SquidHelm:Up deploys the Squid Helm chart to the cluster
 func (SquidHelm) Up() error {
-	// Ensure dependencies are met (squid, squid-exporter, and test images needed)
-	mg.Deps(Build.LoadSquid, Build.LoadSquidExporter, Build.LoadTestImage)
+	// Ensure dependencies are met (squid and test images needed)
+	mg.Deps(Build.LoadSquid, Build.LoadTestImage)
 
 	fmt.Println("⚓ Deploying Squid Helm chart...")
 
@@ -509,11 +463,6 @@ func Clean() error {
 		fmt.Printf("⚠️  Warning: Failed to remove squid image: %v\n", err)
 	}
 
-	err = sh.Run("podman", "rmi", squidExporterImageTag)
-	if err != nil {
-		fmt.Printf("⚠️  Warning: Failed to remove squid-exporter image: %v\n", err)
-	}
-
 	err = sh.Run("podman", "rmi", testImageTag)
 	if err != nil {
 		fmt.Printf("⚠️  Warning: Failed to remove test image: %v\n", err)

squid-exporter/Containerfile

@@ -63,6 +63,7 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ include "squid.image" . }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command: ["/usr/sbin/container-entrypoint.sh"]
           ports:
             - name: http
               containerPort: 3128
@@ -88,31 +89,13 @@ spec:
               mountPath: /var/spool/squid
         {{- if .Values.squidExporter.enabled }}
         - name: squid-exporter
-          image: "{{ .Values.squidExporter.image.repository }}:{{ .Values.squidExporter.image.tag }}"
-          imagePullPolicy: {{ .Values.squidExporter.image.pullPolicy }}
+          image: "{{ include "squid.image" . }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command: ["/usr/sbin/container-entrypoint.sh", "exporter"]
           ports:
             - name: metrics
               containerPort: {{ .Values.squidExporter.port }}
               protocol: TCP
-          env:
-            - name: SQUID_HOSTNAME
-              value: "localhost"
-            - name: SQUID_PORT
-              value: "{{ .Values.service.port }}"
-            - name: SQUID_EXPORTER_LISTEN
-              value: ":{{ .Values.squidExporter.port }}"
-            - name: SQUID_EXPORTER_METRICS_PATH
-              value: "{{ .Values.squidExporter.metricsPath }}"
-            - name: SQUID_EXTRACTSERVICETIMES
-              value: "{{ .Values.squidExporter.extractServiceTimes }}"
-            {{- if .Values.squidExporter.squidLogin }}
-            - name: SQUID_LOGIN
-              value: "{{ .Values.squidExporter.squidLogin }}"
-            {{- end }}
-            {{- if .Values.squidExporter.squidPassword }}
-            - name: SQUID_PASSWORD
-              value: "{{ .Values.squidExporter.squidPassword }}"
-            {{- end }}
           args:
             - -squid-hostname
             - "localhost"

squid/templates/deployment.yaml

@@ -76,15 +76,14 @@ service:
 
 # Squid Prometheus Exporter Configuration
 # This enables monitoring of Squid metrics via Prometheus
-# Note: hostname is hardcoded to "localhost" in deployment template since
-# the exporter runs as a sidecar in the same pod as squid
+# Note: squid-exporter is now integrated into the main squid image
 # Note: squid port is referenced from service.port to avoid duplication
 squidExporter:
-  # Enable or disable the squid-exporter sidecar
+  # Enable or disable the integrated squid-exporter
   enabled: true
-  # Squid exporter container image - using konflux-ci fork instead of third-party
+  # Squid exporter image (now integrated into main squid image)
   image:
-    repository: localhost/konflux-ci/squid-exporter
+    repository: localhost/konflux-ci/squid
     tag: "latest"
     pullPolicy: IfNotPresent
   # Port on which the exporter will serve metrics