openshift · jsafrane · Dec 8, 2022 · Dec 8, 2022 · Dec 8, 2022 · Dec 8, 2022
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.19-openshift-4.12
+  tag: rhel-8-release-golang-1.19-openshift-4.13
diff --git a/.generated_files b/.generated_files
@@ -16,7 +16,6 @@
 
 file-prefix	zz_generated.
 
-file-name	BUILD
 file-name	types.generated.go
 file-name	generated.pb.go
 file-name	generated.proto

diff --git a/.github/OWNERS b/.github/OWNERS
@@ -1,5 +1,8 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 reviewers:
   - alisondy
   - cblecker

diff --git a/.gitignore b/.gitignore
@@ -109,9 +109,6 @@ kubernetes.tar.gz
 # Phony test files used as part of coverage generation
 zz_generated_*_test.go
 
-# make-related metadata
-/.make/
-
 # Just in time generated data in the source, should never be committed
 /test/e2e/generated/bindata.go
 
@@ -126,3 +123,7 @@ vendordiff.patch
 
 # Ignore openshift source archives produced as part of rpm build
 openshift*.tar.gz
+
+# Ensure that openapi definitions are not ignored to ensure that
+# openshift/origin can vendor them.
+!pkg/generated/openapi/zz_generated.openapi.go
diff --git a/.go-version b/.go-version
@@ -0,0 +1 @@
+1.19.6
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -7,19 +7,20 @@ issues:
   max-same-issues: 0
   # Excluding configuration per-path, per-linter, per-text and per-source
   exclude-rules:
-    # exclude ineffassing linter for generated files for conversion
+    # exclude ineffassign linter for generated files for conversion
     - path: conversion\.go
       linters:
         - ineffassign
+    # TODO(oscr) Remove these excluded directories and fix findings. Due to large amount of findings in different components
+    # with different owners it's hard to fix everything in a single pr. This will therefore be done in multiple prs.
+    - path: (pkg/volume/*|test/*|cmd/kubeadm/*|azure/*|pkg/cmd/wait*|request/bearertoken/*|metrics/*|filters/*)
+      linters:
+        - gocritic
 
 linters:
   disable-all: true
   enable: # please keep this alphabetized
-  # Don't use soon to deprecated[1] linters that lead to false
-  # https://github.com/golangci/golangci-lint/issues/1841
-  # - deadcode
-  # - structcheck
-  # - varcheck
+    - gocritic
     - ineffassign
     - logcheck
     - staticcheck
@@ -33,8 +34,11 @@ linters-settings: # please keep this alphabetized
       path: _output/local/bin/logcheck.so
       description: structured logging checker
       original-url: k8s.io/klog/hack/tools
+  gocritic:
+    enabled-checks:
+      - equalFold
+      - boolExprSimplify
   staticcheck:
-    go: "1.18"
     checks: [
       "all",
       "-SA1019", # TODO(fix) Using a deprecated function, variable, constant or field
@@ -44,5 +48,3 @@ linters-settings: # please keep this alphabetized
     checks: [
       "ST1019",  # Importing the same package multiple times.
     ]
-  unused:
-    go: "1.18"
diff --git a/CHANGELOG/CHANGELOG-1.25.md b/CHANGELOG/CHANGELOG-1.25.md
diff --git a/CHANGELOG/CHANGELOG-1.26.md b/CHANGELOG/CHANGELOG-1.26.md
diff --git a/CHANGELOG/OWNERS b/CHANGELOG/OWNERS
@@ -1,19 +1,22 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 approvers:
   - release-engineering-approvers
   - release-managers
   - AuraSinis # 1.24 Release Notes Lead
   - cici37 # 1.23 Release Notes Lead
-  - pmmalinov01 # 1.22 Release Notes Lead
-  - wilsonehusin # 1.21 Release Notes Lead
+  - csantanapr # 1.25 Release Notes Lead
+  - ramrodo # 1.26 Release Notes Lead
 reviewers:
   - release-managers
-  - AuraSinis # 1.24 Release Notes Lead
-  - csantanapr # 1.24 Release Notes Shadow
-  - parul5sahoo # 1.24 Release Notes Shadow
-  - Lp-Francois # 1.24 Release Notes Shadow
-  - RinkiyaKeDad # 1.24 Release Notes Shadow
+  - AnaMMedina21 # 1.26 Release Notes Shadow
+  - harshanarayana # 1.26 Release Notes Shadow
+  - laxmikantbpandhare # 1.26 Release Notes Shadow
+  - ramrodo # 1.26 Release Notes Lead
+  - sayantani11 # 1.26 Release Notes Shadow
 labels:
   - sig/release
   - area/release-eng
diff --git a/CHANGELOG/README.md b/CHANGELOG/README.md
@@ -1,5 +1,6 @@
 # CHANGELOGs
 
+- [CHANGELOG-1.26.md](./CHANGELOG-1.26.md)
 - [CHANGELOG-1.25.md](./CHANGELOG-1.25.md)
 - [CHANGELOG-1.24.md](./CHANGELOG-1.24.md)
 - [CHANGELOG-1.23.md](./CHANGELOG-1.23.md)

diff --git a/DOWNSTREAM_OWNERS b/DOWNSTREAM_OWNERS
@@ -15,6 +15,7 @@ filters:
     - sttts
     - soltysh
     - mfojtik
+    - tkashem
 
   "^\\.go.(mod|sum)$":
     labels:

diff --git a/LICENSES/OWNERS b/LICENSES/OWNERS
@@ -1,4 +1,7 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 approvers:
   - dep-approvers
diff --git a/LICENSES/vendor/github.com/PuerkitoBio/purell/LICENSE b/LICENSES/vendor/github.com/PuerkitoBio/purell/LICENSE
diff --git a/LICENSES/vendor/github.com/PuerkitoBio/urlesc/LICENSE b/LICENSES/vendor/github.com/PuerkitoBio/urlesc/LICENSE
diff --git a/LICENSES/vendor/github.com/cenkalti/backoff/v4/LICENSE b/LICENSES/vendor/github.com/cenkalti/backoff/v4/LICENSE
diff --git a/LICENSES/vendor/github.com/fsnotify/fsnotify/LICENSE b/LICENSES/vendor/github.com/fsnotify/fsnotify/LICENSE
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ filters: @@
         - sttts
         - soltysh
         - mfojtik
+        - tkashem
       "^\\.go.(mod|sum)$":
         labels:
@@ Expand Down @@