Skip to content

Commit 2e594cd

Browse files
Merge pull request #1091 from petr-muller/scaffold-update-status-operator
OTA-1269: Scaffold Update Status Controller (USC)
2 parents 06c5b04 + e7ce0d1 commit 2e594cd

File tree

1,868 files changed

+423332
-1
lines changed

Some content is hidden

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

1,868 files changed

+423332
-1
lines changed

cmd/updatestatuscontroller.go

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package main
2+
3+
import (
4+
"context"
5+
6+
k8sversion "k8s.io/apimachinery/pkg/version"
7+
8+
"github.com/openshift/library-go/pkg/controller/controllercmd"
9+
10+
"github.com/openshift/cluster-version-operator/pkg/updatestatus"
11+
cvoversion "github.com/openshift/cluster-version-operator/pkg/version"
12+
)
13+
14+
func init() {
15+
uscCommand := controllercmd.NewControllerCommandConfig(
16+
"update-status-controller",
17+
// TODO(USC: TechPreview): Unify version handling, potentially modernize CVO pkg/version
18+
// to use k8sversion.Info too.
19+
// https://github.com/openshift/cluster-version-operator/pull/1091#discussion_r1810601697
20+
k8sversion.Info{GitVersion: cvoversion.Raw},
21+
updatestatus.Run,
22+
).NewCommandWithContext(context.Background())
23+
24+
uscCommand.Short = "The Update Status Controller watches cluster state/health during the update process and exposes it through the UpdateStatus API."
25+
uscCommand.Use = "update-status-controller"
26+
27+
rootCmd.AddCommand(uscCommand)
28+
}

go.mod

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ require (
2424
golang.org/x/net v0.23.0
2525
golang.org/x/time v0.3.0
2626
gopkg.in/fsnotify.v1 v1.4.7
27+
gopkg.in/yaml.v3 v3.0.1
2728
k8s.io/api v0.30.1
2829
k8s.io/apiextensions-apiserver v0.30.1
2930
k8s.io/apimachinery v0.30.1
@@ -34,19 +35,31 @@ require (
3435
)
3536

3637
require (
38+
github.com/NYTimes/gziphandler v1.1.1 // indirect
39+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
40+
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
3741
github.com/beorn7/perks v1.0.1 // indirect
42+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3843
github.com/cespare/xxhash/v2 v2.2.0 // indirect
44+
github.com/coreos/go-semver v0.3.1 // indirect
45+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3946
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4047
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
48+
github.com/felixge/httpsnoop v1.0.3 // indirect
49+
github.com/fsnotify/fsnotify v1.7.0 // indirect
4150
github.com/go-logr/logr v1.4.1 // indirect
51+
github.com/go-logr/stdr v1.2.2 // indirect
4252
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4353
github.com/go-openapi/jsonreference v0.20.2 // indirect
4454
github.com/go-openapi/swag v0.22.3 // indirect
4555
github.com/gogo/protobuf v1.3.2 // indirect
4656
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4757
github.com/golang/protobuf v1.5.4 // indirect
58+
github.com/google/cel-go v0.17.8 // indirect
4859
github.com/google/gnostic-models v0.6.8 // indirect
4960
github.com/google/gofuzz v1.2.0 // indirect
61+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
62+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
5063
github.com/imdario/mergo v0.3.12 // indirect
5164
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5265
github.com/josharian/intern v1.0.0 // indirect
@@ -58,20 +71,46 @@ require (
5871
github.com/modern-go/reflect2 v1.0.2 // indirect
5972
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6073
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
74+
github.com/pkg/profile v1.3.0 // indirect
6175
github.com/prometheus/procfs v0.10.1 // indirect
76+
github.com/robfig/cron v1.2.0 // indirect
6277
github.com/sirupsen/logrus v1.9.0 // indirect
6378
github.com/spf13/pflag v1.0.5 // indirect
79+
github.com/stoewer/go-strcase v1.2.0 // indirect
80+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
81+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
82+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
83+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
84+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
85+
go.opentelemetry.io/otel v1.19.0 // indirect
86+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
87+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
88+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
89+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
90+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
91+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
92+
go.uber.org/multierr v1.11.0 // indirect
93+
go.uber.org/zap v1.26.0 // indirect
94+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
6495
golang.org/x/oauth2 v0.10.0 // indirect
96+
golang.org/x/sync v0.6.0 // indirect
6597
golang.org/x/sys v0.18.0 // indirect
6698
golang.org/x/term v0.18.0 // indirect
6799
golang.org/x/text v0.14.0 // indirect
68100
google.golang.org/appengine v1.6.7 // indirect
101+
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
102+
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
103+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
104+
google.golang.org/grpc v1.58.3 // indirect
69105
google.golang.org/protobuf v1.33.0 // indirect
70106
gopkg.in/inf.v0 v0.9.1 // indirect
107+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
71108
gopkg.in/yaml.v2 v2.4.0 // indirect
72-
gopkg.in/yaml.v3 v3.0.1 // indirect
73109
k8s.io/apiserver v0.30.1 // indirect
110+
k8s.io/component-base v0.30.1 // indirect
111+
k8s.io/kms v0.30.1 // indirect
74112
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
113+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
75114
sigs.k8s.io/controller-runtime v0.12.1 // indirect
76115
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
77116
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)