Merge pull request #333 from fsferraz-rh/OSDCONMON-208-update-forwarder-image

OSDCONMON-208 updated splunk forwarder image reference

Author: openshift-merge-bot[bot]

Makefile

@@ -10,7 +10,7 @@ boilerplate-update:
 
 SHELL := /usr/bin/env bash
 
-FORWARDER_IMAGE_TAG ?= 9.3.2-d8bb32809498-c43b7a7
+FORWARDER_IMAGE_TAG ?= 9.3.2-d8bb32809498-d0874e6
 
 FORWARDER_NAME=splunk-forwarder
 FORWARDER_IMAGE_URI=$(IMAGE_REGISTRY)/$(IMAGE_REPOSITORY)/$(FORWARDER_NAME):$(FORWARDER_IMAGE_TAG)

OWNERS_ALIASES

@@ -52,6 +52,7 @@ aliases:
     - npecka
     - pshickeydev
     - casey-williams-rh
+    - boranx
   srep-functional-team-thor:
     - bmeng
     - MitaliBhalla

README.md

@@ -35,7 +35,7 @@ metadata:
   name: example-splunkforwarder
 spec:
   image: dockerimageurl
-  imageDigest: sha256:ee36e2f76856b262fb19096c0bba04fcf7e4399c7819d914d9b8554f119ab42a
+  imageDigest: sha256:a9e19c1c213d093484bdac6220a3ec72fd121ff0ed250bddfcdc50ad2bd4fa07
   splunkLicenseAccepted: true
   clusterID: optional-cluster-name
   splunkInputs:
@@ -52,11 +52,11 @@ spec:
 The `image` and `imageDigest` are for the splunk-forwarder image.
 (The CRD supports `imageTag`, but this is deprecated in favor of `imageDigest`.)
 
-To use the current version, `9.3.2-d8bb32809498-c43b7a7`, specify the following:
+To use the current version, `9.3.2-d8bb32809498-d0874e6`, specify the following:
 - For [splunk-forwarder](https://quay.io/repository/app-sre/splunk-forwarder?tag=8.2.5-77015bc7a462-f4d16f7):
   ```yaml
   image: quay.io/app-sre/splunk-forwarder
-  imageDigest: sha256:ee36e2f76856b262fb19096c0bba04fcf7e4399c7819d914d9b8554f119ab42a
+  imageDigest: sha256:a9e19c1c213d093484bdac6220a3ec72fd121ff0ed250bddfcdc50ad2bd4fa07
   ```
 
 ## Upgrading Splunk Universal Forwarder

boilerplate/_data/last-boilerplate-commit

@@ -1 +1 @@
-4311c1fe186c6a1b907566ae046cdfc9f354fb78
+5d599ff5771f30d4e09248ddcb116375b3a38102

boilerplate/openshift/golang-osd-operator-osde2e/e2e-harness-generate.sh

@@ -63,11 +63,6 @@ container-engine-login:
 # Targets used by e2e test harness
 ######################
 
-# create e2e scaffolding
-.PHONY: e2e-harness-generate
-e2e-harness-generate:
-	${OSDE2E_CONVENTION_DIR}/e2e-harness-generate.sh $(OPERATOR_NAME) $(OSDE2E_CONVENTION_DIR)
-
 # create binary
 .PHONY: e2e-harness-build
 e2e-harness-build: GOFLAGS_MOD=-mod=mod

boilerplate/openshift/golang-osd-operator-osde2e/standard.mk

@@ -10,20 +10,81 @@ source $CONVENTION_ROOT/_lib/common.sh
 # Expect POST
 [[ "$1" == "POST" ]] || err "Got a parameter I don't understand: '$1'. Did the infrastructure change?"
 
-DOCKERFILE=test/e2e/Dockerfile
-if [[ -n ${KONFLUX_BUILDS} && -f "${DOCKERFILE}" ]]; then
-    E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.22"
-    ${SED?} -i "2s,.*,FROM $E2E_SUITE_BUILDER_IMAGE AS builder," "${DOCKERFILE}"
+OPERATOR_NAME=$(sed -n 's/.*OperatorName .*"\([^"]*\)".*/\1/p' "${REPO_ROOT}/config/config.go")
+REPO_ROOT=$(git rev-parse --show-toplevel)
+E2E_SUITE_DIRECTORY=$REPO_ROOT/test/e2e
+
+# Update operator name in templates
+OPERATOR_UNDERSCORE_NAME=${OPERATOR_NAME//-/_}
+OPERATOR_PROPER_NAME=$(echo "$OPERATOR_NAME" | sed 's/-/ /g' | awk '{for(i=1;i<=NF;i++){ $i=toupper(substr($i,1,1)) substr($i,2) }}1')
+OPERATOR_NAME_CAMEL_CASE=${OPERATOR_PROPER_NAME// /}
+
+mkdir -p "${E2E_SUITE_DIRECTORY}"
+
+E2E_SUITE_BUILDER_IMAGE=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
+if [[ -n ${KONFLUX_BUILDS} ]]; then
+	E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.23"
+fi
+
+echo "syncing ${E2E_SUITE_DIRECTORY}/Dockerfile"
+tee "${E2E_SUITE_DIRECTORY}/Dockerfile" <<EOF
+# THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
+FROM ${E2E_SUITE_BUILDER_IMAGE} as builder
+WORKDIR /go/src/github.com/openshift/$OPERATOR_NAME/
+COPY . .
+RUN  CGO_ENABLED=0 GOFLAGS="-mod=mod" go test ./test/e2e -v -c --tags=osde2e -o /e2e.test
+
+FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+COPY --from=builder ./e2e.test e2e.test
+ENTRYPOINT [ "/e2e.test" ]
+EOF
+
+if [ ! -f "${E2E_SUITE_DIRECTORY}/${OPERATOR_UNDERSCORE_NAME}_tests.go" ]; then
+	echo "syncing ${E2E_SUITE_DIRECTORY}/${OPERATOR_UNDERSCORE_NAME}_tests.go"
+	tee "${E2E_SUITE_DIRECTORY}/${OPERATOR_UNDERSCORE_NAME}_tests.go" <<EOF
+// DO NOT REMOVE TAGS BELOW. IF ANY NEW TEST FILES ARE CREATED UNDER /test/e2e, PLEASE ADD THESE TAGS TO THEM IN ORDER TO BE EXCLUDED FROM UNIT TESTS.
+//go:build osde2e
+
+package osde2etests
+
+import "github.com/onsi/ginkgo/v2"
+
+var _ = ginkgo.Describe("$OPERATOR_NAME", func() {
+	//	 Add your tests
+})
+EOF
 fi
 
-# Updates for SDCICD-1414
-[[ ! -d osde2e ]] && exit 0
-[[ -d test/e2e ]] && exit 0
+echo "syncing ${E2E_SUITE_DIRECTORY}/${OPERATOR_UNDERSCORE_NAME}_runner_test.go"
+tee "${E2E_SUITE_DIRECTORY}/${OPERATOR_UNDERSCORE_NAME}_runner_test.go" <<EOF
+// THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
+//go:build osde2e
+
+package osde2etests
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+const (
+	testResultsDirectory = "/test-run-results"
+	jUnitOutputFilename  = "junit-${OPERATOR_NAME}.xml"
+)
 
-mkdir -p test/e2e/
-mv osde2e/* test/e2e/
-rm -rf osde2e/
+// Test entrypoint. osde2e runs this as a test suite on test pod.
+func Test${OPERATOR_NAME_CAMEL_CASE}(t *testing.T) {
+	RegisterFailHandler(Fail)
+	suiteConfig, reporterConfig := GinkgoConfiguration()
+	if _, ok := os.LookupEnv("DISABLE_JUNIT_REPORT"); !ok {
+		reporterConfig.JUnitReport = filepath.Join(testResultsDirectory, jUnitOutputFilename)
+	}
+	RunSpecs(t, "${OPERATOR_PROPER_NAME}", suiteConfig, reporterConfig)
+}
+EOF
 
- if [[  -f "${DOCKERFILE}" ]]; then
-        ${SED?} -i  "s/\.\/osde2e/\.\/test\/e2e/" "${DOCKERFILE}"  
- fi
+sed -e "s/\${OPERATOR_NAME}/${OPERATOR_NAME}/" $(dirname $0)/test-harness-template.yml >"${E2E_SUITE_DIRECTORY}/test-harness-template.yml"

boilerplate/openshift/golang-osd-operator-osde2e/update

@@ -52,6 +52,7 @@ aliases:
     - npecka
     - pshickeydev
     - casey-williams-rh
+    - boranx
   srep-functional-team-thor:
     - bmeng
     - MitaliBhalla

boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES

@@ -69,7 +69,7 @@ tests:
     make e2e-harness-build
   container:
     from: src
-  run_if_changed: ^(osde2e/.*|go\.mod|go\.sum)$
+  run_if_changed: ^(test/e2e/\.*|go\.mod|go\.sum)$
 - as: coverage
   commands: |
     export CODECOV_TOKEN=\$(cat /tmp/secret/CODECOV_TOKEN)

boilerplate/openshift/golang-osd-operator/prow-config

@@ -16,7 +16,18 @@ cp ${HERE}/.codecov.yml $REPO_ROOT
 
 # Add OWNERS_ALIASES to $REPO_ROOT
 echo "Copying OWNERS_ALIASES to your repository root."
-cp ${HERE}/OWNERS_ALIASES $REPO_ROOT
+cp -L ${HERE}/OWNERS_ALIASES $REPO_ROOT
+
+# Add CICD owners to .tekton if exists
+if [[ -d "${REPO_ROOT}/.tekton/" ]]; then
+	echo "Adding Konflux subdirectory OWNERS file to .tekton/"
+	cat >"${REPO_ROOT}/.tekton/OWNERS" <<EOF
+reviewers:
+- srep-infra-cicd
+approvers:
+- srep-infra-cicd
+EOF
+fi
 
 # Add dependabot configuration
 mkdir -p $REPO_ROOT/.github