Fix Webhook proxy BC recreation issue (#1324)

Author: BraisVQ

CHANGELOG.md

@@ -11,6 +11,8 @@
 
 ### Fixed
 
+- Webhook proxy BC recretion issue ([#1265](https://github.com/opendevstack/ods-core/issues/1265))
+
 ## [4.7.0] - 2025-1-27
 
 ### Changed

jenkins/webhook-proxy/Dockerfile

@@ -1,28 +1,34 @@
-# Ideally we would us a very small image like plain alpine and just copy the
-# pre-built binary into it, but due to e.g. multistage builds not available in
-# OpenShift yet, for now the easiest is to build the binary in this image.
-FROM golang:1.23-alpine
+# Build stage
+FROM public.ecr.aws/docker/library/golang:1.23-alpine AS builder
+
+RUN apk update  && \
+    apk -i upgrade && \
+    apk cache clean && \
+    mkdir -p /home/webhook-proxy
+
+COPY main.go /home/webhook-proxy/main.go
+COPY go.mod /home/webhook-proxy/go.mod
+
+WORKDIR /home/webhook-proxy
+
+RUN CGO_ENABLED=0 go build -o webhook-proxy
+
+# Final stage
+FROM registry.access.redhat.com/ubi9/ubi-micro:latest
 
 # Set default ALLOWED_EXTERNAL_PROJECTS env var
 ARG allowedExternalProjects=opendevstack
 ENV ALLOWED_EXTERNAL_PROJECTS=$allowedExternalProjects
 
-RUN apk add -i ca-certificates && \
-    apk update  && \
-    apk -i upgrade && \
-    apk cache clean && \
-    mkdir -p /home/webhook-proxy && \
+RUN mkdir -p /home/webhook-proxy && \
     chgrp -R 0 /home/webhook-proxy && \
     chmod g+w /home/webhook-proxy
 
-COPY main.go /home/webhook-proxy/main.go
-COPY go.mod /home/webhook-proxy/go.mod
+COPY --from=builder /home/webhook-proxy/webhook-proxy /home/webhook-proxy/webhook-proxy
 COPY pipeline.json.tmpl /home/webhook-proxy/pipeline.json.tmpl
 
 WORKDIR /home/webhook-proxy
 
-RUN CGO_ENABLED=0 go build -o webhook-proxy
-
 EXPOSE 8080
 
 CMD ./webhook-proxy

jenkins/webhook-proxy/main.go

@@ -77,21 +77,28 @@ type BuildConfigData struct {
 // buildConfig represents the relevant fields of an OpenShift BuildConfig, see
 // https://docs.openshift.com/container-platform/3.11/rest_api/apis-build.openshift.io/v1.BuildConfig.html#object-schema.
 type buildConfig struct {
-	Metadata struct {
-		ResourceVersion string `json:"resourceVersion"`
-	} `json:"metadata"`
-	Spec struct {
-		Source struct {
-			Git struct {
-				Ref string `json:"ref"`
-			} `json:"git"`
-		} `json:"source"`
-		Strategy struct {
-			JenkinsPipelineStrategy struct {
-				JenkinsfilePath string `json:"jenkinsfilePath"`
-			} `json:"jenkinsPipelineStrategy"`
-		} `json:"strategy"`
-	} `json:"spec"`
+    Metadata struct {
+        ResourceVersion string `json:"resourceVersion"`
+    } `json:"metadata"`
+    Spec struct {
+        Source struct {
+            Git struct {
+                Ref string `json:"ref"`
+            } `json:"git"`
+        } `json:"source"`
+        Strategy struct {
+            JenkinsPipelineStrategy struct {
+                JenkinsfilePath string `json:"jenkinsfilePath"`
+            } `json:"jenkinsPipelineStrategy"`
+        } `json:"strategy"`
+        Triggers []struct {
+            Type string `json:"type"`
+            // Generic struct {
+            //     Secret string `json:"secret"`
+            //     AllowEnv bool `json:"allowEnv"`
+            // } `json:"generic"`
+        } `json:"triggers"`
+    } `json:"spec"`
 }
 
 // Client makes requests, e.g. to create and delete pipelines, or to forward
@@ -509,6 +516,18 @@ func (s *Server) HandleRoot() http.HandlerFunc {
 					updatePipeline = true
 					resourceVersion = bc.Metadata.ResourceVersion
 				}
+				triggerExists := false
+				for _, trigger := range bc.Spec.Triggers {
+					if trigger.Type != "" {
+						triggerExists = true
+						break
+					}
+				}
+				if !triggerExists {
+					log.Println(requestID, "Trigger secret does not exist, updating pipeline")
+					updatePipeline = true
+					resourceVersion = bc.Metadata.ResourceVersion
+				}
 			}
 
 			buildConfigData := BuildConfigData{