stolostron · clyang82 · Aug 6, 2024 · Aug 6, 2024 · Aug 6, 2024 · Aug 6, 2024
diff --git a/.tekton/glo-grafana-globalhub-1-3-pull-request.yaml b/.tekton/glo-grafana-globalhub-1-3-pull-request.yaml
diff --git a/.tekton/glo-grafana-globalhub-1-3-push.yaml b/.tekton/glo-grafana-globalhub-1-3-push.yaml
diff --git a/.tekton/glo-grafana-globalhub-1-7-pull-request.yaml b/.tekton/glo-grafana-globalhub-1-7-pull-request.yaml
@@ -0,0 +1,66 @@
+apiVersion: tekton.dev/v1
+kind: PipelineRun
+metadata:
+  annotations:
+    build.appstudio.openshift.io/repo: https://github.com/stolostron/glo-grafana?rev={{revision}}
+    build.appstudio.redhat.com/commit_sha: '{{revision}}'
+    build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
+    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
+    pipelinesascode.tekton.dev/cancel-in-progress: "true"
+    pipelinesascode.tekton.dev/max-keep-runs: "3"
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
+      == "release-1.7"
+  creationTimestamp: null
+  labels:
+    appstudio.openshift.io/application: release-globalhub-1-7
+    appstudio.openshift.io/component: glo-grafana-globalhub-1-7
+    pipelines.appstudio.openshift.io/type: build
+  name: glo-grafana-globalhub-1-7-on-pull-request
+  namespace: acm-multicluster-glo-tenant
+spec:
+  params:
+  - name: git-url
+    value: '{{source_url}}'
+  - name: revision
+    value: '{{revision}}'
+  - name: output-image
+    value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/glo-grafana-globalhub-1-7:on-pr-{{revision}}
+  - name: image-expires-after
+    value: 5d
+  - name: build-platforms
+    value:
+    - linux/x86_64
+    - linux/ppc64le
+    - linux/s390x
+    - linux/arm64
+  - name: dockerfile
+    value: Containerfile.konflux
+  - name: path-context
+    value: .
+  - name: build-source-image
+    value: "true"
+  - name: hermetic
+    value: "true"
+  - name: prefetch-input
+    value: '[ {"type": "gomod", "path": "."} ]'
+  taskRunSpecs:
+    - pipelineTaskName: build-source-image
+      computeResources:
+        limits:
+          memory: 2Gi
+  pipelineRef:
+    resolver: git
+    params:
+      - name: url
+        value: "https://github.com/stolostron/konflux-build-catalog.git"
+      - name: revision
+        value: main
+      - name: pathInRepo
+        value: pipelines/common.yaml
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-glo-grafana-globalhub-1-7
+  workspaces:
+  - name: git-auth
+    secret:
+      secretName: '{{ git_auth_secret }}'
+status: {}
diff --git a/.tekton/glo-grafana-globalhub-1-7-push.yaml b/.tekton/glo-grafana-globalhub-1-7-push.yaml
@@ -0,0 +1,77 @@
+apiVersion: tekton.dev/v1
+kind: PipelineRun
+metadata:
+  annotations:
+    build.appstudio.openshift.io/build-nudge-files: "konflux-patch.sh"
+    build.appstudio.openshift.io/repo: https://github.com/stolostron/glo-grafana?rev={{revision}}
+    build.appstudio.redhat.com/commit_sha: '{{revision}}'
+    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
+    pipelinesascode.tekton.dev/cancel-in-progress: "false"
+    pipelinesascode.tekton.dev/max-keep-runs: "3"
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
+      == "release-1.7"
+  creationTimestamp: null
+  labels:
+    appstudio.openshift.io/application: release-globalhub-1-7
+    appstudio.openshift.io/component: glo-grafana-globalhub-1-7
+    pipelines.appstudio.openshift.io/type: build
+  name: glo-grafana-globalhub-1-7-on-push
+  namespace: acm-multicluster-glo-tenant
+spec:
+  params:
+  - name: git-url
+    value: '{{source_url}}'
+  - name: revision
+    value: '{{revision}}'
+  - name: output-image
+    value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/glo-grafana-globalhub-1-7:{{revision}}
+  - name: build-platforms
+    value:
+    - linux/x86_64
+    - linux/ppc64le
+    - linux/s390x
+    - linux/arm64
+  - name: dockerfile
+    value: Containerfile.konflux
+  - name: path-context
+    value: .
+  - name: build-source-image
+    value: "true"
+  - name: hermetic
+    value: "true"
+  - name: prefetch-input
+    value: '[ {"type": "gomod", "path": "."} ]'
+  - name: send-slack-notification
+    value: "true"
+  - name: konflux-application-name
+    value: "release-globalhub-1-7"
+  - name: slack-webhook-url-secret-name
+    # See details: https://konflux.pages.redhat.com/docs/users/patterns/slack-notifications.html
+    value: "slack-notify-webhook"
+  - name: slack-webhook-url-secret-key
+    value: "slack-webhook-url"
+  - name: slack-group-id
+    # Will mention the user in the slack message when the pipeline run failed; this is not required.
+    # Please make sure replace the value with component owner's slack member id.
+    value: "S09JCE3DF9N"
+  taskRunSpecs:
+    - pipelineTaskName: build-source-image
+      computeResources:
+        limits:
+          memory: 2Gi
+  pipelineRef:
+    resolver: git
+    params:
+      - name: url
+        value: "https://github.com/stolostron/konflux-build-catalog.git"
+      - name: revision
+        value: main
+      - name: pathInRepo
+        value: pipelines/common.yaml
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-glo-grafana-globalhub-1-7
+  workspaces:
+  - name: git-auth
+    secret:
+      secretName: '{{ git_auth_secret }}'
+status: {}
diff --git a/Containerfile.operator → Containerfile.konflux b/Containerfile.operator → Containerfile.konflux
@@ -1,5 +1,5 @@
 # Golang build container
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22 AS builder 
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 AS builder
 
 WORKDIR $GOPATH/src/github.com/grafana/grafana
 
@@ -23,46 +23,32 @@ COPY .bingo .bingo
 COPY conf conf
 COPY go.* ./
 
-RUN go work vendor
-RUN go run build.go -build-tags=strictfipsruntime build 
+ENV GOFLAGS="-mod=readonly"
+
+RUN go mod verify
+RUN make build-go 
 
 # Need to copy the generated binaries to a non-platform specific location to handle
 # s390x builds for example
-RUN cp $GOPATH/src/github.com/grafana/grafana/bin/linux-$(go env GOARCH)/grafana* /usr/bin/
+RUN cp ./bin/linux-$(go env GOARCH)/grafana* /usr/bin/
 
 # Final container
-FROM registry.access.redhat.com/ubi9/ubi:latest
-
-ARG VCS_REF
-ARG VCS_URL
-ARG IMAGE_NAME
-ARG IMAGE_DESCRIPTION
-ARG IMAGE_DISPLAY_NAME
-ARG IMAGE_NAME_ARCH
-ARG IMAGE_MAINTAINER
-ARG IMAGE_VENDOR
-ARG IMAGE_VERSION
-ARG IMAGE_RELEASE
-ARG IMAGE_SUMMARY
-ARG IMAGE_OPENSHIFT_TAGS
-
-LABEL org.label-schema.vendor="Red Hat" \
-    org.label-schema.name="$IMAGE_NAME_ARCH" \
-    org.label-schema.description="$IMAGE_DESCRIPTION" \
-    org.label-schema.vcs-ref=$VCS_REF \
-    org.label-schema.vcs-url=$VCS_URL \
-    org.label-schema.license="Red Hat Advanced Cluster Management for Kubernetes EULA" \
-    org.label-schema.schema-version="1.0" \
-    name="$IMAGE_NAME" \
-    maintainer="$IMAGE_MAINTAINER" \
-    vendor="$IMAGE_VENDOR" \
-    version="$IMAGE_VERSION" \
-    release="$IMAGE_RELEASE" \
-    description="$IMAGE_DESCRIPTION" \
-    summary="$IMAGE_SUMMARY" \
-    io.k8s.display-name="$IMAGE_DISPLAY_NAME" \
-    io.k8s.description="$IMAGE_DESCRIPTION" \
-    io.openshift.tags="$IMAGE_OPENSHIFT_TAGS"
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
+
+# Red Hat annotations.
+LABEL com.redhat.component="multicluster-globalhub-grafana-rhel9"
+LABEL cpe="cpe:/a:redhat:multicluster_globalhub:1.7::el9"
+
+# Bundle metadata
+LABEL name="multicluster-globalhub/multicluster-globalhub-grafana-rhel9"
+LABEL version="release-1.7"
+LABEL summary="Grafana is an open-source, general purpose dashboard and graph composer"
+LABEL io.openshift.expose-services=""
+LABEL io.openshift.tags="data,images"
+LABEL io.k8s.display-name="Grafana"
+LABEL io.k8s.description="Grafana is an open-source, general purpose dashboard and graph composer"
+LABEL maintainer="['acm-component-maintainers@redhat.com']"
+LABEL description="Grafana is an open-source, general purpose dashboard and graph composer"
 
 ARG GF_UID="472"
 ARG GF_GID="472"
@@ -103,4 +89,3 @@ COPY ./packaging/docker/run.sh /run.sh
 
 USER grafana
 ENTRYPOINT [ "/run.sh" ]
-
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1
 
-ARG BASE_IMAGE=alpine:3.19.1
-ARG JS_IMAGE=node:20-alpine
+ARG BASE_IMAGE=alpine:3.21.3
+ARG JS_IMAGE=node:22-alpine
 ARG JS_PLATFORM=linux/amd64
-ARG GO_IMAGE=golang:1.22.4-alpine
+ARG GO_IMAGE=golang:1.24.1-alpine
 
 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder

diff --git a/Dockerfile.ocp b/Dockerfile.ocp
@@ -1,5 +1,5 @@
 # Golang build container
-FROM registry.ci.openshift.org/stolostron/builder:go1.22-linux AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 AS builder
 
 WORKDIR $GOPATH/src/github.com/grafana/grafana
 
@@ -23,21 +23,31 @@ COPY .bingo .bingo
 COPY conf conf
 COPY go.* ./
 
+ENV GOFLAGS="-mod=readonly"
+
 RUN go mod verify
 RUN make build-go 
 
 # Need to copy the generated binaries to a non-platform specific location to handle
 # s390x builds for example
-RUN cp $GOPATH/src/github.com/grafana/grafana/bin/linux-$(go env GOARCH)/grafana* /usr/bin/
+RUN cp ./bin/linux-$(go env GOARCH)/grafana* /usr/bin/
 
 # Final container
 FROM registry.access.redhat.com/ubi9/ubi:latest
 
-LABEL io.k8s.display-name="Grafana" \
-      io.k8s.description="Grafana is an open-source, general purpose dashboard and graph composer" \
-      io.openshift.tags="openshift" \
-      summary="Grafana is an open-source, general purpose dashboard and graph composer" \
-      maintainer="Red Hat Advanced Cluster Management for Kubernetes <acm-component-maintainers@redhat.com>"
+# Red Hat annotations.
+LABEL com.redhat.component="multicluster-global-hub-grafana"
+
+# Bundle metadata
+LABEL name="multicluster-global-hub/multicluster-global-hub-grafana"
+LABEL version="release-1.5"
+LABEL summary="Grafana is an open-source, general purpose dashboard and graph composer"
+LABEL io.openshift.expose-services=""
+LABEL io.openshift.tags="data,images"
+LABEL io.k8s.display-name="Grafana"
+LABEL io.k8s.description="Grafana is an open-source, general purpose dashboard and graph composer"
+LABEL maintainer="['acm-component-maintainers@redhat.com']"
+LABEL description="Grafana is an open-source, general purpose dashboard and graph composer"
 
 ARG GF_UID="472"
 ARG GF_GID="472"

diff --git a/devenv/docker/blocks/auth/nginx_proxy_mac/Dockerfile b/devenv/docker/blocks/auth/nginx_proxy_mac/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.19.3-alpine
+FROM nginx:1.27.4-alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY htpasswd /etc/nginx/htpasswd
diff --git a/devenv/docker/blocks/auth/prometheus_basic_auth_proxy/Dockerfile b/devenv/docker/blocks/auth/prometheus_basic_auth_proxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.19.3-alpine
+FROM nginx:1.27.4-alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY htpasswd /etc/nginx/htpasswd
diff --git a/devenv/docker/blocks/collectd/Dockerfile b/devenv/docker/blocks/collectd/Dockerfile
@@ -1,4 +1,4 @@
-FROM    ubuntu:xenial
+FROM    ubuntu:noble
 
 ENV     DEBIAN_FRONTEND noninteractive
 

diff --git a/devenv/docker/blocks/elastic/data/Dockerfile b/devenv/docker/blocks/elastic/data/Dockerfile
@@ -1,3 +1,3 @@
-FROM node:16-alpine
+FROM node:22-alpine
 
 COPY data.js /home/node/data.js
diff --git a/devenv/docker/blocks/graphite09/Dockerfile b/devenv/docker/blocks/graphite09/Dockerfile
@@ -1,4 +1,4 @@
-from  ubuntu:14.04
+from  ubuntu:24.04
 
 run apt-get -y update
 

diff --git a/devenv/docker/blocks/loki/data/Dockerfile b/devenv/docker/blocks/loki/data/Dockerfile
@@ -1,3 +1,3 @@
-FROM node:18-alpine
+FROM node:22-alpine
 
 COPY data.js /home/node/data.js
diff --git a/devenv/docker/blocks/mssql_arm64/build/Dockerfile b/devenv/docker/blocks/mssql_arm64/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/azure-sql-edge:1.0.4
+FROM mcr.microsoft.com/azure-sql-edge:2.0.0
 WORKDIR /usr/setup
 COPY entrypoint.sh ./
 

diff --git a/devenv/docker/blocks/mysql_tests/Dockerfile b/devenv/docker/blocks/mysql_tests/Dockerfile
@@ -1,4 +1,4 @@
-ARG mysql_version=8.0.32
+ARG mysql_version=9.2.0
 FROM mysql:${mysql_version}
 ADD setup.sql /docker-entrypoint-initdb.d
 RUN chown -R mysql:mysql /docker-entrypoint-initdb.d/

diff --git a/devenv/docker/blocks/postgres_tests/Dockerfile b/devenv/docker/blocks/postgres_tests/Dockerfile
@@ -1,4 +1,4 @@
-ARG postgres_version=11.20-alpine3.18
+ARG postgres_version=16.3-alpine3.18
 FROM postgres:${postgres_version}
 ADD setup.sql /docker-entrypoint-initdb.d
 RUN chown -R postgres:postgres /docker-entrypoint-initdb.d/

diff --git a/devenv/docker/blocks/prometheus_random_data/Dockerfile b/devenv/docker/blocks/prometheus_random_data/Dockerfile
@@ -1,7 +1,7 @@
 # This Dockerfile builds an image for a client_golang example.
 
 # Builder image, where we build the example.
-FROM golang:1.17 AS builder
+FROM golang:1.24 AS builder
 # Download prometheus/client_golang/examples/random first
 RUN CGO_ENABLED=0 GOOS=linux go install -tags netgo -ldflags '-w' github.com/prometheus/client_golang/examples/random@v1.12.2
 

diff --git a/devenv/docker/buildcontainer/Dockerfile b/devenv/docker/buildcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:6.6
+FROM centos:6.10
 
 RUN yum install -y initscripts curl tar gcc libc6-dev git
 

diff --git a/devenv/docker/debtest/Dockerfile b/devenv/docker/debtest/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:jessie
+FROM debian:bookworm
 
 RUN apt-get update && apt-get install -y vim
 

diff --git a/devenv/docker/ha-test-unified-alerting/Dockerfile b/devenv/docker/ha-test-unified-alerting/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19
+FROM golang:1.24
 
 ADD webhook-listener.go /go/src/webhook/webhook-listener.go