[ACM-5438] Upgrade with resolved merge conflict

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Report a bug encountered while running kube-state-metrics
+title: ''
+labels: kind/bug
+assignees: ''
+
+---
+
+<!-- Please use this template while reporting a bug and provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner. Thanks!
+
+If the matter is security related, please disclose it privately see https://github.com/kubernetes/kube-state-metrics/blob/main/SECURITY.md
+-->
+
+**What happened**:
+
+**What you expected to happen**:
+
+**How to reproduce it (as minimally and precisely as possible)**:
+
+**Anything else we need to know?**:
+
+**Environment**:
+- kube-state-metrics version: 
+- Kubernetes version (use `kubectl version`):
+- Cloud provider or hardware configuration:
+- Other info:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest a new feature
+title: ''
+labels: kind/feature
+assignees: ''
+
+---
+
+<!-- Please only use this template for submitting feature requests -->
+
+**What would you like to be added**:
+
+**Why is this needed**:
+
+**Describe the solution you'd like**
+
+**Additional context**

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,6 +7,7 @@
 
 **What this PR does / why we need it**:
 
+**How does this change affect the cardinality of KSM**: *(increases, decreases or does not change cardinality)*
+
 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
 Fixes #
-

.github/workflows/ci.yml

@@ -0,0 +1,209 @@
+name: continuous-integration
+
+on:
+  push:
+    branches:
+    - main
+    - release*
+    tags:
+    - v1.*
+    - v2.*
+  pull_request:
+    branches:
+    - main
+    - release*
+
+permissions:
+  contents: read
+
+env:
+  E2E_SETUP_KIND: yes
+  E2E_SETUP_KUBECTL: yes
+  SUDO: sudo
+  GO_VERSION: "^1.19"
+  GOLANGCI_LINT_VERSION: "v1.51.2"
+
+jobs:
+  ci-go-lint:
+    name: ci-go-lint
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v3
+      with:
+        go-version: ${{ env.GO_VERSION }}
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
+
+    - name: Setup environment
+      run: |
+        make install-tools
+
+    - name: Lint
+      run: |
+        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${{ env.GOLANGCI_LINT_VERSION }}
+        make lint
+
+  ci-validate-manifests:
+    name: ci-validate-manifests
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v3
+      with:
+        go-version: ${{ env.GO_VERSION }}
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
+
+    - name: Setup environment
+      run: |
+        make install-tools
+
+    - name: Validate generated manifests
+      run: |
+        make validate-manifests
+
+  ci-validate-go-modules:
+    name: ci-validate-go-modules
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v3
+      with:
+        go-version: ${{ env.GO_VERSION }}
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
+
+    - name: Setup environment
+      run: |
+        make install-tools
+
+    - name: Validate go modules
+      run: |
+        make validate-modules
+
+  ci-validate-docs:
+    name: ci-validate-docs
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v3
+      with:
+        go-version: ${{ env.GO_VERSION }}
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
+
+    - name: Setup environment
+      run: |
+        make install-tools
+
+    - name: Check that all metrics are documented
+      run: |
+        make doccheck
+
+  ci-unit-tests:
+    name: ci-unit-tests
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v3
+      with:
+        go-version: ${{ env.GO_VERSION }}
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
+
+    - name: Setup environment
+      run: |
+        make install-tools
+
+    - name: Unit tests
+      run: |
+        make test-unit
+
+  ci-rule-tests:
+    name: ci-rule-tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Setup promtool
+        run: |
+          make install-promtool
+
+      - name: Rule tests
+        run: |
+          PROMTOOL_CLI=./promtool make test-rules
+
+  ci-benchmark-tests:
+    name: ci-benchmark-tests
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v3
+      with:
+        go-version: ${{ env.GO_VERSION }}
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
+
+    - name: Setup environment
+      run: |
+        make install-tools
+
+    - name: Benchmark tests
+      run: |
+        make test-benchmark-compare
+
+  ci-build-kube-state-metrics:
+    name: ci-build-kube-state-metrics
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v3
+      with:
+        go-version: ${{ env.GO_VERSION }}
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
+
+    - name: Setup environment
+      run: |
+        make install-tools
+
+    - name: Build
+      run: |
+        make build
+
+  ci-e2e-tests:
+    name: ci-e2e-tests
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v3
+      with:
+        go-version: ${{ env.GO_VERSION }}
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
+
+    - name: Setup environment
+      run: |
+        make install-tools
+
+    - name: End-to-end tests
+      run: |
+        make e2e

.github/workflows/govulncheck.yml

@@ -0,0 +1,26 @@
+name: govulncheck
+
+on:
+  schedule:
+    # Run every Monday
+    - cron: '0 0 * * 1'
+
+env:
+  GO_VERSION: "^1.19"
+
+jobs:
+  ci-security-checks:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        name: Checkout code
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      - name: Install govulncheck binary
+        run: |
+          go install golang.org/x/vuln/cmd/govulncheck@latest
+      - name: Run security checks
+        run: |
+          govulncheck -v ./...

.gitignore

@@ -2,13 +2,18 @@
 documented_metrics
 code_metrics
 
+# E2e tests output
+/log
+*.bak
+
 # Created by https://www.gitignore.io/api/go
 
 ### Go ###
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
 *.o
 *.a
 *.so
+vendor
 
 # Folders
 _obj

.golangci.yml

@@ -1,20 +1,38 @@
 run:
-  deadline: 2m
+  deadline: 5m
 
 linters:
   disable-all: true
   enable:
+    - gocritic
+    - gocyclo
     - gofmt
     - goimports
-    - golint
-    - staticcheck
-    - gocyclo
+    - gosec
+    - gosimple
+    - govet
     - ineffassign
     - misspell
-    - gocritic
-    - govet
+    - promlinter
+    - revive
+    - staticcheck
     - unconvert
 
 linters-settings:
   goimports:
-    local-prefixes: k8s.io/kube-state-metrics
+    local-prefixes: k8s.io/kube-state-metrics,k8s.io/kube-state-metrics/v2
+
+issues:
+  exclude-use-default: false
+  exclude-rules:
+    # We don't check metrics naming in the tests.
+    - path: _test\.go
+      linters:
+        - promlinter
+    # TODO(mrueg) Improve error handling
+    - text: "G104:"
+      linters:
+        - gosec
+    - text: "package-comments:"
+      linters:
+        - revive