Skip to content

Commit a245572

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #461 from jatinsu/OKD-featureset
OKD-259: Allow the OKD feature set to upgrade
2 parents 1788046 + 5543b05 commit a245572

1,344 files changed

Lines changed: 105280 additions & 38662 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Dockerfile.rhel7‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder
2+
ARG TAGS=""
23
WORKDIR /go/src/github.com/openshift/cluster-config-operator
34
COPY . .
45
ENV GO_PACKAGE github.com/openshift/cluster-config-operator

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
1111

1212
IMAGE_REGISTRY?=registry.svc.ci.openshift.org
1313

14+
TAGS ?=
15+
GO_BUILD_FLAGS := $(if ${TAGS},-tags ${TAGS},)
1416
# This will call a macro called "build-image" which will generate image specific targets based on the parameters:
1517
# $0 - macro name
1618
# $1 - target suffix

‎go.mod‎

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ require (
88
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
99
github.com/go-bindata/go-bindata v3.1.2+incompatible
1010
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250804142706-7b3ab438a292
11-
github.com/openshift/api v0.0.0-20250806102053-6a7223edb2fc
11+
github.com/openshift/api v0.0.0-20260121130051-59aa3e50a9fb
1212
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
13-
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
14-
github.com/openshift/library-go v0.0.0-20250711143941-47604345e7ea
15-
github.com/spf13/cobra v1.8.1
16-
github.com/spf13/pflag v1.0.5
17-
github.com/stretchr/testify v1.10.0
13+
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13
14+
github.com/openshift/library-go v0.0.0-20260121132910-dc3a1c884c04
15+
github.com/spf13/cobra v1.9.1
16+
github.com/spf13/pflag v1.0.6
17+
github.com/stretchr/testify v1.11.1
1818
gopkg.in/gcfg.v1 v1.2.0
19-
k8s.io/api v0.33.3
20-
k8s.io/apimachinery v0.33.3
21-
k8s.io/client-go v0.33.3
22-
k8s.io/component-base v0.33.3
19+
k8s.io/api v0.34.1
20+
k8s.io/apimachinery v0.34.1
21+
k8s.io/client-go v0.34.1
22+
k8s.io/component-base v0.34.1
2323
k8s.io/klog/v2 v2.130.1
2424
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
2525
sigs.k8s.io/yaml v1.6.0
2626
)
2727

2828
require (
29-
cel.dev/expr v0.19.1 // indirect
29+
cel.dev/expr v0.24.0 // indirect
3030
github.com/NYTimes/gziphandler v1.1.1 // indirect
3131
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3232
github.com/beorn7/perks v1.0.1 // indirect
@@ -35,10 +35,10 @@ require (
3535
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3636
github.com/coreos/go-semver v0.3.1 // indirect
3737
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
38-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
38+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3939
github.com/felixge/fgprof v0.9.4 // indirect
4040
github.com/felixge/httpsnoop v1.0.4 // indirect
41-
github.com/fsnotify/fsnotify v1.7.0 // indirect
41+
github.com/fsnotify/fsnotify v1.9.0 // indirect
4242
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4343
github.com/go-logr/logr v1.4.3 // indirect
4444
github.com/go-logr/stdr v1.2.2 // indirect
@@ -48,21 +48,21 @@ require (
4848
github.com/gogo/protobuf v1.3.2 // indirect
4949
github.com/golang/protobuf v1.5.4 // indirect
5050
github.com/google/btree v1.1.3 // indirect
51-
github.com/google/cel-go v0.23.2 // indirect
52-
github.com/google/gnostic-models v0.6.9 // indirect
51+
github.com/google/cel-go v0.26.0 // indirect
52+
github.com/google/gnostic-models v0.7.0 // indirect
5353
github.com/google/go-cmp v0.7.0 // indirect
5454
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
5555
github.com/google/uuid v1.6.0 // indirect
5656
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
57-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
57+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
5858
github.com/imdario/mergo v0.3.7 // indirect
5959
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6060
github.com/josharian/intern v1.0.0 // indirect
6161
github.com/json-iterator/go v1.1.12 // indirect
6262
github.com/kylelemons/godebug v1.1.0 // indirect
6363
github.com/mailru/easyjson v0.7.7 // indirect
6464
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
65-
github.com/modern-go/reflect2 v1.0.2 // indirect
65+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6666
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6767
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
6868
github.com/onsi/gomega v1.38.0 // indirect
@@ -77,50 +77,51 @@ require (
7777
github.com/sirupsen/logrus v1.9.3 // indirect
7878
github.com/stoewer/go-strcase v1.3.0 // indirect
7979
github.com/x448/float16 v0.8.4 // indirect
80-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
81-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
82-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
80+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
81+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
82+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
8383
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
84-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
84+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
8585
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
86-
go.opentelemetry.io/otel v1.33.0 // indirect
87-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
88-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
89-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
90-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
91-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
92-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
86+
go.opentelemetry.io/otel v1.35.0 // indirect
87+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
88+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
89+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
90+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
91+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
92+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
9393
go.uber.org/multierr v1.11.0 // indirect
9494
go.uber.org/zap v1.27.0 // indirect
9595
go.yaml.in/yaml/v2 v2.4.2 // indirect
96-
golang.org/x/crypto v0.40.0 // indirect
96+
go.yaml.in/yaml/v3 v3.0.4 // indirect
97+
golang.org/x/crypto v0.45.0 // indirect
9798
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
98-
golang.org/x/net v0.42.0 // indirect
99+
golang.org/x/net v0.47.0 // indirect
99100
golang.org/x/oauth2 v0.27.0 // indirect
100-
golang.org/x/sync v0.16.0 // indirect
101-
golang.org/x/sys v0.34.0 // indirect
102-
golang.org/x/term v0.33.0 // indirect
103-
golang.org/x/text v0.27.0 // indirect
101+
golang.org/x/sync v0.18.0 // indirect
102+
golang.org/x/sys v0.38.0 // indirect
103+
golang.org/x/term v0.37.0 // indirect
104+
golang.org/x/text v0.31.0 // indirect
104105
golang.org/x/time v0.9.0 // indirect
105-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
106-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
107-
google.golang.org/grpc v1.68.1 // indirect
106+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
107+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
108+
google.golang.org/grpc v1.72.1 // indirect
108109
google.golang.org/protobuf v1.36.6 // indirect
109110
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
110111
gopkg.in/inf.v0 v0.9.1 // indirect
111112
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
112113
gopkg.in/warnings.v0 v0.1.1 // indirect
113114
gopkg.in/yaml.v3 v3.0.1 // indirect
114-
k8s.io/apiextensions-apiserver v0.33.2 // indirect
115-
k8s.io/apiserver v0.33.2 // indirect
116-
k8s.io/kms v0.33.2 // indirect
117-
k8s.io/kube-aggregator v0.33.2 // indirect
118-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
115+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
116+
k8s.io/apiserver v0.34.1 // indirect
117+
k8s.io/kms v0.34.1 // indirect
118+
k8s.io/kube-aggregator v0.34.1 // indirect
119+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
119120
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
120121
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
121122
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
122123
sigs.k8s.io/randfill v1.0.0 // indirect
123-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
124+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
124125
)
125126

126127
// This replace is required for we use the OCP fork of Ginkgo.

0 commit comments

Comments
 (0)