Skip to content

Commit bcac502

Browse files
jc-rhjc-rh
authored
Merge branch 'main' into dependabot/go_modules/github.com/operator-framework/api-0.33.0
2 parents 229accb + a1d5353 commit bcac502

27 files changed

+1233
-1229
lines changed

‎.ci-operator.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
build_root_image:
23
name: release
34
namespace: openshift

‎.github/dependabot.yml

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1+
---
12
# To get started with Dependabot version updates, you'll need to specify which
23
# package ecosystems to update and where the package manifests are located.
34
# Please see the documentation for all configuration options:
45
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5-
6-
version: 2
76
updates:
8-
- package-ecosystem: "gomod" # See documentation for possible values
9-
directory: "/" # Location of package manifests
10-
schedule:
11-
interval: "daily"
12-
open-pull-requests-limit: 5
13-
groups:
14-
k8s:
15-
patterns: [ "k8s.io/*", "sig.k8s.io/*" ]
16-
update-types: [ "major", "minor", "patch" ]
17-
ginkgo:
18-
patterns: ["github.com/onsi/gomega", "github.com/onsi/ginkgo/v2"]
19-
update-types: [ "major", "minor" ]
20-
ocm:
21-
patterns: ["open-cluster-management.io/*"]
22-
# ignore:
23-
# - dependency-name: "*"
24-
# update-types: ["version-update:semver-patch"]
7+
- directory: "/" # Location of package manifests
8+
groups:
9+
ginkgo:
10+
patterns: ["github.com/onsi/gomega", "github.com/onsi/ginkgo/v2"]
11+
update-types: ["major", "minor"]
12+
k8s:
13+
patterns: ["k8s.io/*", "sig.k8s.io/*"]
14+
update-types: ["major", "minor", "patch"]
15+
ocm:
16+
patterns: ["open-cluster-management.io/*"]
17+
open-pull-requests-limit: 5
18+
package-ecosystem: "gomod" # See documentation for possible values
19+
schedule:
20+
interval: "daily"
21+
version: 2

‎.golangci.yml

Lines changed: 58 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
---
2-
run:
3-
concurrency: 6
4-
deadline: 5m
5-
skip-files:
6-
- ".*_test\\.go"
72
linters:
83
disable-all: true
94
enable:
@@ -27,27 +22,40 @@ linters:
2722
- gosec
2823
- wrapcheck
2924
linters-settings:
30-
revive:
25+
depguard:
26+
# Rules to apply.
27+
#
28+
# Variables:
29+
# - File Variables
30+
# you can still use and exclamation mark ! in front of a variable to say not to use it.
31+
# Example !$test will match any file that is not a go test file.
32+
#
33+
# `$all` - matches all go files
34+
# `$test` - matches all go test files
35+
#
36+
# - Package Variables
37+
#
38+
# `$gostd` - matches all of go's standard library (Pulled from `GOROOT`)
39+
#
40+
# Default: Only allow $gostd in all files.
3141
rules:
32-
- name: if-return
33-
severity: warning
34-
disabled: true
35-
- name: string-format
36-
severity: warning
37-
disabled: false
38-
arguments:
39-
- - 'core.WriteError[1].Message'
40-
- '/^([^A-Z]|$)/'
41-
- must not start with a capital letter
42-
- - 'fmt.Errorf[0]'
43-
- '/^([^A-Z]|$)/'
44-
- must not start with a capital letter
45-
- - 'fmt.Errorf[0]'
46-
- '/(^|[^\.!?])$/'
47-
- must not end in punctuation
48-
- - panic
49-
- '/^[^\n]*$/'
50-
- must not contain line breaks
42+
# Name of a rule.
43+
main:
44+
# List of allowed packages.
45+
# allow:
46+
# - $gostd
47+
# Packages that are not allowed where the value is a suggestion.
48+
deny:
49+
- desc: Should be replaced by standard lib errors package
50+
pkg: "github.com/pkg/errors"
51+
# List of file globs that will match this list of settings to compare against.
52+
# Default: $all
53+
files:
54+
- $all
55+
# Used to determine the package matching priority.
56+
# There are three different modes: `original`, `strict`, and `lax`.
57+
# Default: "original"
58+
list-mode: lax
5159
gocritic:
5260
enabled-checks:
5361
# Diagnostic
@@ -69,13 +77,11 @@ linters-settings:
6977
- weakCond
7078
- octalLiteral
7179
- sloppyReassign
72-
7380
# Performance
7481
- equalFold
7582
- indexAlloc
7683
- rangeExprCopy
7784
- appendCombine
78-
7985
# Style
8086
- assignOp
8187
- boolExprSimplify
@@ -103,48 +109,34 @@ linters-settings:
103109
- valSwap
104110
- yodaStyleExpr
105111
- wrapperFunc
106-
107112
# Opinionated
108113
- initClause
109114
- nestingReduce
110115
- ptrToRefParam
111116
- typeUnparen
112117
- unnecessaryBlock
113118
- paramTypeCombine
114-
depguard:
115-
# Rules to apply.
116-
#
117-
# Variables:
118-
# - File Variables
119-
# you can still use and exclamation mark ! in front of a variable to say not to use it.
120-
# Example !$test will match any file that is not a go test file.
121-
#
122-
# `$all` - matches all go files
123-
# `$test` - matches all go test files
124-
#
125-
# - Package Variables
126-
#
127-
# `$gostd` - matches all of go's standard library (Pulled from `GOROOT`)
128-
#
129-
# Default: Only allow $gostd in all files.
119+
revive:
130120
rules:
131-
# Name of a rule.
132-
main:
133-
# Used to determine the package matching priority.
134-
# There are three different modes: `original`, `strict`, and `lax`.
135-
# Default: "original"
136-
list-mode: lax
137-
# List of file globs that will match this list of settings to compare against.
138-
# Default: $all
139-
files:
140-
- $all
141-
# List of allowed packages.
142-
#allow:
143-
# - $gostd
144-
# Packages that are not allowed where the value is a suggestion.
145-
deny:
146-
- pkg: "github.com/pkg/errors"
147-
desc: Should be replaced by standard lib errors package
121+
- disabled: true
122+
name: if-return
123+
severity: warning
124+
- arguments:
125+
- - 'core.WriteError[1].Message'
126+
- '/^([^A-Z]|$)/'
127+
- must not start with a capital letter
128+
- - 'fmt.Errorf[0]'
129+
- '/^([^A-Z]|$)/'
130+
- must not start with a capital letter
131+
- - 'fmt.Errorf[0]'
132+
- '/(^|[^\.!?])$/'
133+
- must not end in punctuation
134+
- - panic
135+
- '/^[^\n]*$/'
136+
- must not contain line breaks
137+
disabled: false
138+
name: string-format
139+
severity: warning
148140
wrapcheck:
149141
ignoreSigs:
150142
# defaults
@@ -158,3 +150,8 @@ linters-settings:
158150
- .WithStack(
159151
# from kyaml's errors package
160152
- .WrapPrefixf(
153+
run:
154+
concurrency: 6
155+
deadline: 5m
156+
skip-files:
157+
- ".*_test\\.go"

‎.konflux/Dockerfile.catalog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# The opm image is expected to contain /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
2-
ARG OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.20
2+
ARG OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.20
3+
# CNF-18555: When there is a Konflux build available for this then we need to update from the brew image
34
ARG BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24
45

56
# build the catalog

‎.konflux/catalog/bundle.builds.in.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
quay: quay.io/redhat-user-workloads/telco-5g-tenant/lifecycle-agent-operator-bundle-4-20@sha256:28454733387a8ca66a2bf2e87f07685da7fbb6f3714c58dc0200203732f884d4
2+
quay: quay.io/redhat-user-workloads/telco-5g-tenant/lifecycle-agent-operator-bundle-4-20@sha256:f4ba736320be274bb8de52c328f1e5263b459b055b243f53171842e4129a56ef

‎.konflux/catalog/fbc-images-resolvable-integration-test-idms.yaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# We use this IDMS to check if the images in the FBC are resolvable using the staging or production catalog.
23
# https://github.com/konflux-ci/community-catalog/tree/development/pipelines/validate-fbc-images-resolvable
34
apiVersion: operator.openshift.io/v1
@@ -6,12 +7,12 @@ metadata:
67
name: fbc-images-resolvable-integration-test-idms
78
spec:
89
imageDigestMirrors:
9-
- mirrors:
10-
- registry.stage.redhat.io/openshift4/lifecycle-agent-rhel9-operator
11-
source: registry.redhat.io/openshift4/lifecycle-agent-rhel9-operator
12-
- mirrors:
13-
- registry.stage.redhat.io/openshift4/lifecycle-agent-operator-bundle
14-
source: registry.redhat.io/openshift4/lifecycle-agent-operator-bundle
15-
- mirrors:
16-
- registry.stage.redhat.io/openshift4/recert-rhel9
17-
source: registry.redhat.io/openshift4/recert-rhel9
10+
- mirrors:
11+
- registry.stage.redhat.io/openshift4/lifecycle-agent-rhel9-operator
12+
source: registry.redhat.io/openshift4/lifecycle-agent-rhel9-operator
13+
- mirrors:
14+
- registry.stage.redhat.io/openshift4/lifecycle-agent-operator-bundle
15+
source: registry.redhat.io/openshift4/lifecycle-agent-operator-bundle
16+
- mirrors:
17+
- registry.stage.redhat.io/openshift4/recert-rhel9
18+
source: registry.redhat.io/openshift4/recert-rhel9

‎.konflux/container_build_args.conf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@ KONFLUX=true
33
#
44

55
# The builder image is used to compile golang code
6+
# CNF-18555: When there is a Konflux build available for this then we need to update from the brew image
67
BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24@sha256:b91431604c435f3cabec20ddb653c0537c8ba8097ada57960d54a1266f95a7c3
78
#
89

910
# The openshift cli image is used to fetch the oc binary
1011
# When 4.20 is released, we need to update from the v4.18 tag
11-
OPENSHIFT_CLI_IMAGE=registry.redhat.io/openshift4/ose-cli-rhel9:v4.18@sha256:0fea17baf0f6e10bf43b2e05d413cbe092e3edc807c4eae93a9bd5cee479a343
12+
OPENSHIFT_CLI_IMAGE=registry.redhat.io/openshift4/ose-cli-rhel9:v4.18@sha256:505fdc081f1dc0fda7c10a36c51bb32cda0ae0e36277ed6b7211931098462425
1213
#
1314

1415
# The opm image is used to serve the FBC
1516
# There is a metadata processing bug preventing us from pinning this particular image for now
16-
# OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.20@sha256:3c89f04f5299307eda4a6d732aab8529ff15fb4fc081e1296f165f6360e418be
17+
# OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.20@sha256:a7ce355c287b89aa5565d3c9d0e6e9913fac9fa7819759ac4acf0a32dcb4a27a
1718
#
1819

1920
# The runtime image is used to run the binaries
20-
RUNTIME_IMAGE=registry.redhat.io/rhel9-4-els/rhel-minimal:9.4@sha256:83865568f25a483dcd7f84831dd0de8cef393943515bbb1a7d3a93b72886dbf8
21+
RUNTIME_IMAGE=registry.redhat.io/rhel9-4-els/rhel-minimal:9.4@sha256:08f50c8e4b8ae004bbd2588bd6c1f61ee55dbe7fa10232e44e5cc779ef2fde2e
2122
#
2223

2324
# The yq image is used at build time to manipulate yaml

‎.konflux/lock-runtime/rpms.in.yaml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1+
---
2+
arches:
3+
- x86_64
4+
- aarch64
15
contentOrigin:
26
repofiles:
3-
# rhel9 rpm repos
4-
- ./redhat.repo
5-
7+
# rhel9 rpm repos
8+
- ./redhat.repo
9+
context:
10+
containerfile:
11+
file: ../Dockerfile
12+
stageName: runtime-image
613
packages:
714
- util-linux-core
815
- rsync
916
- tar
10-
11-
arches:
12-
- x86_64
13-
- aarch64
14-
15-
context:
16-
containerfile:
17-
file: ../Dockerfile
18-
stageName: runtime-image

0 commit comments

Comments
 (0)