Merged with release-2.7

Signed-off-by: Nathaniel Graham <ngraham@redhat.com>

.busybox-versions

@@ -1,6 +1,14 @@
 # Auto generated by busybox-updater.sh. DO NOT EDIT
+<<<<<<< HEAD
 amd64=c9f983fc55b0b74723a69c31688cca7d5a2e5b2af7c954780f29a331817982f3
 arm64=1349554b18d6c349a390929c2a4855fadb003b2243aabf2cc71b931068c69279
 arm=be08b36d0e8f90b6fb317d29582c632ce365a00648a81c4022c4ff79df928ad9
 ppc64le=d44f541b0df83608110e695b9a1e71604ab94924954a1b18f6d76c4b5871cadd
 s390x=007b2b388c575d00c7234d29227bbb8216786d7ba3f86d82696dc6fe86ac1ec0
+=======
+amd64=60ded79a99eb70aa36d57c598707c961ffa4f9f7b63237823a780eaf6d437a78
+arm64=d2e2aa8b7fd3d11412c4918ed35bcabc13027ed4812932a94b29940805a87176
+arm=53e81f95dc293546ed76257636bd4ec60cba74297ea637aefd37fe9446b66a59
+ppc64le=d3f30bf50b2d6e7097ad02a1c3d64c5ffe535b969d80d24bb9543391122d4b8c
+s390x=c12940cb7882554a5cb5c582facc2a01a9f30447c1aa067c9c1cca7c9f16c7ee
+>>>>>>> release-2.7

.github/workflows/go.yaml

@@ -60,8 +60,8 @@ jobs:
       - name: Format.
         run: make format
 
-      - name: Linting & vetting.
-        run: make go-lint
+      # - name: Linting & vetting.
+      #   run: make go-lint
   e2e:
     strategy:
       fail-fast: false
@@ -90,5 +90,5 @@ jobs:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
 
-      - name: Run e2e docker-based tests.
-        run: make test-e2e GH_PARALLEL=${{ matrix.parallelism }} GH_INDEX=${{ matrix.index }}
+      # - name: Run e2e docker-based tests.
+      #   run: make test-e2e GH_PARALLEL=${{ matrix.parallelism }} GH_INDEX=${{ matrix.index }}

Dockerfile

@@ -1,5 +1,5 @@
 # By default we pin to amd64 sha. Use make docker to automatically adjust for arm64 versions.
-ARG BASE_DOCKER_SHA="14d68ca3d69fceaa6224250c83d81d935c053fb13594c811038c461194599973"
+ARG BASE_DOCKER_SHA="d8d3654786836cad8c09543704807c7a6d75de53b9e9cd21a1bbd8cb1a607004"
 FROM quay.io/prometheus/busybox@sha256:${BASE_DOCKER_SHA}
 LABEL maintainer="The Thanos Authors"
 

Dockerfile.multi-arch

@@ -1,5 +1,5 @@
 # By default we pin to amd64 sha. Use make docker to automatically adjust for arm64 versions.
-ARG BASE_DOCKER_SHA="97a9aacc097e5dbdec33b0d671adea0785e76d26ff2b979ee28570baf6a9155d"
+ARG BASE_DOCKER_SHA="d8d3654786836cad8c09543704807c7a6d75de53b9e9cd21a1bbd8cb1a607004"
 
 FROM quay.io/prometheus/busybox@sha256:${BASE_DOCKER_SHA}
 LABEL maintainer="The Thanos Authors"

OWNERS

@@ -1,10 +1,15 @@
 approvers:
+- bjoydeep
 - clyang82
+- dislbenn
 - marcolan018
-- bjoydeep
 - subbarao-meduri
+<<<<<<< HEAD
 - dislbenn
 - ngraham20
 
+=======
+options: {}
+>>>>>>> release-2.7
 reviewers:
-- morvencao
+- morvencao

sonar-project.properties

@@ -0,0 +1,10 @@
+sonar.projectKey=open-cluster-management_thanos
+sonar.projectName=thanos
+sonar.sources=.
+sonar.exclusions=**/*_test.go,**/*_generated*.go,**/*_generated/**,**/vendor/**,main.go
+sonar.tests=.
+sonar.test.inclusions=**/*_test.go
+sonar.test.exclusions=**/*_generated*.go,**/*_generated/**,**/vendor/**
+sonar.go.tests.reportPaths=report.json
+sonar.go.coverage.reportPaths=coverage.out
+sonar.externalIssuesReportPaths=gosec.json