Merge branch 'main' into fix/chart-appVersion

Signed-off-by: lvlcn-t <[email protected]>

Author: lvlcn-t

.github/workflows/ci.yml

@@ -26,6 +26,9 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
+      
+      - name: Install syft for sbom generation
+        uses: anchore/sbom-action/[email protected]
 
       - name: Build snapshot artifacts
         uses: goreleaser/goreleaser-action@v6

.github/workflows/e2e_checks.yml

@@ -44,6 +44,9 @@ jobs:
           "network_plugin": "kathara/katharanp_vde"
           }' > ~/.config/kathara.conf
 
+      - name: Install syft for sbom generation
+        uses: anchore/sbom-action/[email protected]
+
       - name: Build binary for e2e
         uses: goreleaser/goreleaser-action@v6
         with:

.github/workflows/release.yml

@@ -36,6 +36,9 @@ jobs:
           registry: mtr.devops.telekom.de
           username: ${{ secrets.MTR_USERNAME }}
           password: ${{ secrets.MTR_PASSWORD }}
+      
+      - name: Install syft for sbom generation
+        uses: anchore/sbom-action/[email protected]
 
       - name: Build, push & release
         uses: goreleaser/goreleaser-action@v6

.goreleaser-ci.yaml

@@ -1,3 +1,4 @@
+version: 2
 project_name: sparrow
 snapshot:
   version_template: "{{ .Tag }}-commit-{{ .ShortCommit }}"
@@ -13,15 +14,17 @@ builds:
       - arm64
 dockers:
   - image_templates:
-      - "ghcr.io/caas-team/sparrow:{{ .Version }}"
+      - "ghcr.io/telekom/sparrow:{{ .Version }}"
       - "mtr.devops.telekom.de/sparrow/sparrow:{{ .Version }}"
     dockerfile: Dockerfile
     build_flag_templates:
       - --label=org.opencontainers.image.title={{ .ProjectName }}
       - --label=org.opencontainers.image.description="This is a pre-release version. Do not use this in production!"
       - --label=org.opencontainers.image.url=https://caas.telekom.de
-      - --label=org.opencontainers.image.source=https://github.com/caas-team/sparrow
+      - --label=org.opencontainers.image.source=https://github.com/telekom/sparrow
       - --label=org.opencontainers.image.version={{ .Version }}
       - --label=org.opencontainers.image.created={{ .Timestamp }}
       - --label=org.opencontainers.image.revision={{ .FullCommit }}
       - --label=org.opencontainers.image.licenses="Apache 2.0"
+sboms:
+  - artifacts: archive

.goreleaser.yaml

@@ -1,3 +1,4 @@
+version: 2
 project_name: sparrow
 builds:
   - env: [CGO_ENABLED=0]
@@ -11,10 +12,10 @@ builds:
       - arm64
 dockers:
   - image_templates:
-      - "ghcr.io/caas-team/sparrow:latest"
-      - "ghcr.io/caas-team/sparrow:{{ .Tag }}"
-      - "ghcr.io/caas-team/sparrow:v{{ .Major }}.{{ .Minor }}"
-      - "ghcr.io/caas-team/sparrow:v{{ .Major }}"
+      - "ghcr.io/telekom/sparrow:latest"
+      - "ghcr.io/telekom/sparrow:{{ .Tag }}"
+      - "ghcr.io/telekom/sparrow:v{{ .Major }}.{{ .Minor }}"
+      - "ghcr.io/telekom/sparrow:v{{ .Major }}"
       - "mtr.devops.telekom.de/sparrow/sparrow:latest"
       - "mtr.devops.telekom.de/sparrow/sparrow:{{ .Tag }}"
       - "mtr.devops.telekom.de/sparrow/sparrow:v{{ .Major }}.{{ .Minor }}"
@@ -24,7 +25,7 @@ dockers:
       - --label=org.opencontainers.image.title={{ .ProjectName }}
       - --label=org.opencontainers.image.description={{ .ProjectName }}
       - --label=org.opencontainers.image.url=https://caas.telekom.de
-      - --label=org.opencontainers.image.source=https://github.com/caas-team/sparrow
+      - --label=org.opencontainers.image.source=https://github.com/telekom/sparrow
       - --label=org.opencontainers.image.version={{ .Version }}
       - --label=org.opencontainers.image.created={{ .Timestamp }}
       - --label=org.opencontainers.image.revision={{ .FullCommit }}
@@ -33,9 +34,14 @@ nfpms:
   - maintainer: CaaS <[email protected]>
     description: |-
       Monitoring tool to gather infrastructure network information
-    homepage: https://github.com/caas-team
+    homepage: https://github.com/telekom
     license: Apache 2.0
     formats:
       - deb
       - rpm
       - apk
+sboms:
+  - id: archive
+    artifacts: archive
+  - id: source
+    artifacts: source

README.md

@@ -2,8 +2,8 @@
 
 <!-- markdownlint-disable MD033 -->
 <p align="center">
-  <a href="/../../commits/" title="Last Commit"><img alt="Last Commit" src="https://img.shields.io/github/last-commit/caas-team/sparrow?style=flat"></a>
-  <a href="/../../issues" title="Open Issues"><img alt="Open Issues" src="https://img.shields.io/github/issues/caas-team/sparrow?style=flat"></a>
+  <a href="/../../commits/" title="Last Commit"><img alt="Last Commit" src="https://img.shields.io/github/last-commit/telekom/sparrow?style=flat"></a>
+  <a href="/../../issues" title="Open Issues"><img alt="Open Issues" src="https://img.shields.io/github/issues/telekom/sparrow?style=flat"></a>
   <a href="./LICENSE" title="License"><img alt="License" src="https://img.shields.io/badge/License-Apache%202.0-green.svg?style=flat"></a>
 </p>
 <!-- markdownlint-enable MD033 -->
@@ -73,7 +73,7 @@ ensuring robust monitoring and quick detection of potential issues.
 
 The `sparrow` is provided as a small binary & a container image.
 
-Please refer to the [release notes](https://github.com/caas-team/sparrow/releases) to get the latest version.
+Please refer to the [release notes](https://github.com/telekom/sparrow/releases) to get the latest version.
 
 ### Binary
 
@@ -87,8 +87,8 @@ export RELEASE_VERSION=0.5.0
 Download the binary:
 
 ```sh
-curl https://github.com/caas-team/sparrow/releases/download/v${RELEASE_VERSION}/sparrow_${RELEASE_VERSION}_linux_amd64.tar.gz -Lo sparrow.tar.gz
-curl https://github.com/caas-team/sparrow/releases/download/v${RELEASE_VERSION}/sparrow_${RELEASE_VERSION}_checksums.txt -Lo checksums.txt
+curl https://github.com/telekom/sparrow/releases/download/v${RELEASE_VERSION}/sparrow_${RELEASE_VERSION}_linux_amd64.tar.gz -Lo sparrow.tar.gz
+curl https://github.com/telekom/sparrow/releases/download/v${RELEASE_VERSION}/sparrow_${RELEASE_VERSION}_checksums.txt -Lo checksums.txt
 ```
 
 Extract the binary:
@@ -99,15 +99,15 @@ tar -xf sparrow.tar.gz
 
 ### Container Image
 
-The [sparrow container images](https://github.com/caas-team/sparrow/pkgs/container/sparrow) for
-dedicated [release](https://github.com/caas-team/sparrow/releases) can be found in the GitHub registry.
+The [sparrow container images](https://github.com/telekom/sparrow/pkgs/container/sparrow) for
+dedicated [release](https://github.com/telekom/sparrow/releases) can be found in the GitHub registry.
 
 ### Helm
 
 Sparrow can be installed via Helm Chart. The chart is available in the GitHub registry:
 
 ```sh
-helm -n sparrow upgrade -i sparrow oci://ghcr.io/caas-team/charts/sparrow --create-namespace
+helm -n sparrow upgrade -i sparrow oci://ghcr.io/telekom/charts/sparrow --create-namespace
 ```
 
 The default settings are suitable for a local configuration. With the default Helm values, the sparrow loader uses a
@@ -151,12 +151,12 @@ sparrow run --sparrowName sparrow.telekom.de
 
 ### Image
 
-Run a `sparrow` container by using e.g. `docker run ghcr.io/caas-team/sparrow`.
+Run a `sparrow` container by using e.g. `docker run ghcr.io/telekom/sparrow`.
 
-Pass the available configuration arguments to the container e.g. `docker run ghcr.io/caas-team/sparrow --help`.
+Pass the available configuration arguments to the container e.g. `docker run ghcr.io/telekom/sparrow --help`.
 
 Start the instance using a mounted startup configuration file
-e.g. `docker run -v /config:/config  ghcr.io/caas-team/sparrow --config /config/config.yaml`.
+e.g. `docker run -v /config:/config  ghcr.io/telekom/sparrow --config /config/config.yaml`.
 
 ## Configuration
 
@@ -710,9 +710,9 @@ The application itself and all end-user facing content will be made available in
 The following channels are available for discussions, feedback, and support requests:
 
 <!-- markdownlint-disable MD033 -->
-| Type       | Channel                                                                                                                                                             |
-| ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Issues** | <a href="/../../issues/new/choose" title="General Discussion"><img alt="Issues" src="https://img.shields.io/github/issues/caas-team/sparrow?style=flat-square"></a> |
+| Type       | Channel                                                                                                                                                           |
+| ---------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Issues** | <a href="/../../issues/new/choose" title="General Discussion"><img alt="Issues" src="https://img.shields.io/github/issues/telekom/sparrow?style=flat-square"></a> |
 <!-- markdownlint-enable MD033 -->
 
 ## How to Contribute

chart/Chart.template.yaml

@@ -4,17 +4,17 @@ description: A Helm chart to install Sparrow
 type: application
 keywords:
   - monitoring
-icon: https://github.com/caas-team/sparrow/blob/main/docs/img/sparrow.png
+icon: https://github.com/telekom/sparrow/blob/main/docs/img/sparrow.png
 sources:
-  - https://github.com/caas-team/sparrow
+  - https://github.com/telekom/sparrow
 maintainers:
   - name: y-eight
     email: [email protected]
     url: https://www.telekom.com
   - name: puffitos
     email: [email protected]
     url: https://www.telekom.com
-  - name: niklastreml
+  - name: ntreml
     email: [email protected]
     url: https://www.telekom.com
   - name: lvlcn-t