Fix all the violations and warnings

Signed-off-by: Rakshitha-Kamath <[email protected]>

Author: Rakshitha-Kamath

.tekton/grafana-9-0-pull-request.yaml

@@ -24,8 +24,6 @@ spec:
     value: '{{revision}}'
   - name: output-image
     value: quay.io/rhceph-ci/grafana:on-pr-{{revision}}
-  - name: image-expires-after
-    value: 5d
   - name: build-platforms
     value:
     - linux/x86_64
@@ -83,19 +81,19 @@ spec:
       description: Skip checks against built image
       name: skip-checks
       type: string
-    - default: "false"
+    - default: "true"
       description: Execute the build with network isolation
       name: hermetic
       type: string
-    - default: ""
+    - default: '[{"type": "gomod", "path": "."}, {"type": "rpm", "path": "."}]'
       description: Build dependencies to be prefetched by Cachi2
       name: prefetch-input
       type: string
     - default: ""
       description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
       name: image-expires-after
       type: string
-    - default: "false"
+    - default: "true"
       description: Build a source image.
       name: build-source-image
       type: string
@@ -190,6 +188,8 @@ spec:
         value: $(params.output-image).prefetch
       - name: ociArtifactExpiresAfter
         value: $(params.image-expires-after)
+      - name: ACTIVATION_KEY
+        value: rkamath-activation-key
       runAfter:
       - clone-repository
       taskRef:
@@ -561,6 +561,11 @@ spec:
         value: $(tasks.build-image-index.results.IMAGE_URL)
       - name: IMAGE_DIGEST
         value: $(tasks.build-image-index.results.IMAGE_DIGEST)
+      - name: ADDITIONAL_TAGS
+        value:
+          - "pull-request-{{pull_request_number}}"
+          - "from-branch-{{source_branch}}"
+          - "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
       runAfter:
       - build-image-index
       taskRef:

.tekton/grafana-9-0-push.yaml

@@ -80,19 +80,19 @@ spec:
       description: Skip checks against built image
       name: skip-checks
       type: string
-    - default: "false"
+    - default: "true"
       description: Execute the build with network isolation
       name: hermetic
       type: string
-    - default: ""
+    - default: '[{"type": "gomod", "path": "."}, {"type": "rpm", "path": "."}]'
       description: Build dependencies to be prefetched by Cachi2
       name: prefetch-input
       type: string
     - default: ""
       description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
       name: image-expires-after
       type: string
-    - default: "false"
+    - default: "true"
       description: Build a source image.
       name: build-source-image
       type: string

Dockerfile

@@ -1,7 +1,8 @@
 # Build stage 1
 
-#FROM brew.registry.redhat.io/rh-osbs/openshift/golang-builder:rhel_9_golang_1.23 AS builder
-FROM quay.io/projectquay/golang:1.24 AS builder
+ARG BASE_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24
+
+FROM ${BASE_IMAGE} AS builder
 
 COPY grafana grafana
 
@@ -12,7 +13,8 @@ ENV GOFLAGS="-mod=vendor"
 RUN go run -mod vendor build.go -dev build
 
 # Build stage 2
-FROM registry.redhat.io/ubi10/ubi-minimal:latest
+#FROM registry.redhat.io/ubi10/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi10-minimal:latest
 
 # Update the image to get the latest CVE updates
 RUN microdnf update -y
@@ -26,17 +28,17 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi
     GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
 
 RUN rm -rf $GF_PATHS_HOME && mkdir -p $GF_PATHS_HOME
-COPY --from=builder go/grafana/bin/grafana /usr/bin/grafana
-COPY --from=builder go/grafana/bin/grafana-server /usr/bin/grafana-server
-COPY --from=builder go/grafana/bin/grafana-cli /usr/bin/grafana-cli
-COPY --from=builder go/grafana/conf $GF_PATHS_HOME/conf/
-COPY --from=builder go/grafana/docs $GF_PATHS_HOME/docs/
-COPY --from=builder go/grafana/public $GF_PATHS_HOME/public/
-COPY --from=builder go/grafana/scripts $GF_PATHS_HOME/scripts/
+COPY --from=builder /grafana/pkg/cmd/grafana /usr/bin/grafana
+COPY --from=builder /grafana/pkg/cmd/grafana-server /usr/bin/grafana-server
+COPY --from=builder /grafana/pkg/cmd/grafana-cli /usr/bin/grafana-cli
+COPY --from=builder /grafana/conf $GF_PATHS_HOME/conf/
+COPY --from=builder /grafana/docs $GF_PATHS_HOME/docs/
+COPY --from=builder /grafana/public $GF_PATHS_HOME/public/
+COPY --from=builder /grafana/scripts $GF_PATHS_HOME/scripts/
 
 RUN rm -rf /etc/grafana && mkdir -p /etc/grafana
-COPY --from=builder go/grafana/conf/sample.ini $GF_PATHS_CONFIG
-COPY --from=builder go/grafana/conf/ldap.toml /etc/grafana/ldap.toml
+COPY --from=builder /grafana/conf/sample.ini $GF_PATHS_CONFIG
+COPY --from=builder /grafana/conf/ldap.toml /etc/grafana/ldap.toml
 COPY ./run.sh /run.sh
 
 # Create grafana user/group
@@ -72,4 +74,8 @@ LABEL name="grafana"
 LABEL description="Red Hat Ceph Storage Grafana container"
 LABEL summary="Grafana container on RHEL 9 for Red Hat Ceph Storage"
 LABEL io.k8s.display-name="Grafana on RHEL 9"
+LABEL io.k8s.description="grafana-container"
 LABEL io.openshift.tags="rhceph ceph dashboard grafana"
+LABEL cpe=cpe:/a:redhat:ceph_storage:9::el10
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
+