Merge branch 'master' into endpoints

openshift · Jun 1, 2022 · 3207564 · 3207564
2 parents e17a9dc + beaaed6
commit 3207564
Show file tree

Hide file tree

Showing 9,742 changed files with 1,517,621 additions and 385,762 deletions.
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.17-openshift-4.10
+  tag: rhel-8-release-golang-1.18-openshift-4.11
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -91,7 +91,7 @@ body:
   - type: textarea
     id: runtime
     attributes:
-      label: Container runtime (CRI) and and version (if applicable)
+      label: Container runtime (CRI) and version (if applicable)
       value: |
         <details>
 

diff --git a/.github/OWNERS b/.github/OWNERS
@@ -8,7 +8,7 @@ reviewers:
   - nikhita
   - parispittman
 approvers:
-  - sig-contribex-approvers
+  - sig-contributor-experience-approvers
   - parispittman
 emeritus_approvers:
   - castrojo

diff --git a/.gitignore b/.gitignore
@@ -103,20 +103,9 @@ network_closure.sh
 # Downloaded kubernetes binary release tar ball
 kubernetes.tar.gz
 
-# generated files in any directory
-# TODO(thockin): uncomment this when we stop committing the generated files.
-#zz_generated.*
-zz_generated.openapi.go
+# Phony test files used as part of coverage generation
 zz_generated_*_test.go
 
-# TODO(roycaihw): remove this when we stop committing the generated definition
-!staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go
-!staging/src/k8s.io/kube-aggregator/pkg/generated/openapi/zz_generated.openapi.go
-# low-change blueprint in code-generator to notice changes
-!staging/src/k8s.io/code-generator/examples/apiserver/openapi/zz_generated.openapi.go
-# low-change sample-apiserver spec to be compilable when published
-!staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go
-
 # make-related metadata
 /.make/
 

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -21,10 +21,17 @@ linters:
   # - structcheck
   # - varcheck
     - ineffassign
+    - logcheck
     - staticcheck
     - unused
 
 linters-settings: # please keep this alphabetized
+  custom:
+    logcheck:
+      # Installed there by hack/verify-golangci-lint.sh.
+      path: _output/local/bin/logcheck.so
+      description: structured logging checker
+      original-url: k8s.io/klog/hack/tools
   staticcheck:
     go: "1.17"
     checks: [

diff --git a/CHANGELOG/CHANGELOG-1.10.md b/CHANGELOG/CHANGELOG-1.10.md
diff --git a/CHANGELOG/CHANGELOG-1.11.md b/CHANGELOG/CHANGELOG-1.11.md
diff --git a/CHANGELOG/CHANGELOG-1.12.md b/CHANGELOG/CHANGELOG-1.12.md
diff --git a/CHANGELOG/CHANGELOG-1.13.md b/CHANGELOG/CHANGELOG-1.13.md
diff --git a/CHANGELOG/CHANGELOG-1.14.md b/CHANGELOG/CHANGELOG-1.14.md
diff --git a/CHANGELOG/CHANGELOG-1.15.md b/CHANGELOG/CHANGELOG-1.15.md
diff --git a/CHANGELOG/CHANGELOG-1.16.md b/CHANGELOG/CHANGELOG-1.16.md