Merge pull request #2 from slashpai/rhobs-master

Sync with Openshift master

.github/workflows/lint-test-chart.yaml

@@ -3,7 +3,6 @@ name: Lint and Test Chart
 on:
   pull_request:
     paths:
-      - .github/workflows/lint-test-chart.yaml
       - "charts/metrics-server/**"
 
 jobs:
@@ -16,12 +15,12 @@ jobs:
         shell: bash
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
         with:
           fetch-depth: 0
 
       - name: Set-up Python
-        uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4.6.1
+        uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 # v4.4.0
         with:
           python-version: "3.x"
 
@@ -41,7 +40,7 @@ jobs:
           rm -f /tmp/ah.tar.gz
 
       - name: Set-up chart-testing
-        uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76 # v2.4.0
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # v2.3.1
 
       - name: Check for changes
         id: changes
@@ -64,7 +63,7 @@ jobs:
 
       - name: Create Kind cluster
         if: fromJSON(steps.changes.outputs.changed)
-        uses: helm/kind-action@fa81e57adff234b2908110485695db0f181f3c67 # v1.7.0
+        uses: helm/kind-action@d8ccf8fb623ce1bb360ae2f45f323d9d5c5e9f00 # v1.5.0
         with:
           wait: 120s
 

.github/workflows/release-chart.yaml

@@ -17,7 +17,7 @@ jobs:
         shell: bash
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
         with:
           fetch-depth: 0
 
@@ -28,13 +28,13 @@ jobs:
 
       - name: Get chart version
         id: chart_version
-        uses: mikefarah/yq@5ef537f3fd1a9437aa3ee44c32c6459a126efdc4 # v4.34.1
+        uses: mikefarah/yq@87cba2ecbeaecf860efcceb66deab46ae030ce1e # v4.30.6
         with:
           cmd: yq eval '.version' './charts/metrics-server/Chart.yaml'
 
       - name: Get chart app version
         id: chart_app_version
-        uses: mikefarah/yq@5ef537f3fd1a9437aa3ee44c32c6459a126efdc4 # v4.34.1
+        uses: mikefarah/yq@87cba2ecbeaecf860efcceb66deab46ae030ce1e # v4.30.6
         with:
           cmd: yq eval '.appVersion' './charts/metrics-server/Chart.yaml'
 

.github/workflows/release.yaml

@@ -7,18 +7,14 @@ on:
 
 jobs:
   build:
-    name: build
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
+        uses: actions/checkout@v2
       - name: Build manifests
         run: make release-manifests
       - name: Release
-        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15
+        uses: softprops/action-gh-release@v1
         with:
           files: |
             _output/components.yaml

.golangci.yml

@@ -5,6 +5,8 @@ linters:
   disable-all: true
   enable:
     - bodyclose
+    - deadcode
+    - depguard
     - dogsled
     - dupl
     - errcheck
@@ -21,12 +23,14 @@ linters:
     - misspell
     - nakedret
     - nolintlint
-    - staticcheck
+    - rowserrcheck
+    - structcheck
     - typecheck
     - unconvert
     - unused
+    - varcheck
     - whitespace
 
 linters-settings:
   goimports:
-    local-prefixes: sigs.k8s.io/metrics-server
+local-prefixes: sigs.k8s.io/metrics-server

Dockerfile

@@ -1,7 +1,7 @@
 # Update the base image in Makefile when updating golang version. This has to
 # be pre-pulled in order to work on GCB.
 ARG ARCH
-FROM golang:1.20.5 as build
+FROM golang:1.19.11 as build
 
 WORKDIR /go/src/sigs.k8s.io/metrics-server
 COPY go.mod .