Skip to content

Commit eb9ec36

Browse files
rohanKanojiamanusa
authored andcommitted
deps (openshift-model) : Update OpenShift Model dependencies to latest available versions (#5286)
Update OpenShift Model deps to latest version. Add new types for OpenShift 4.13.12 Signed-off-by: Rohan Kumar <[email protected]>
1 parent dd457f8 commit eb9ec36

File tree

229 files changed

+27063
-2261
lines changed

Some content is hidden

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

229 files changed

+27063
-2261
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
* Fix #5220: refinements and clarifications to the validation of names
2626

2727
#### Dependency Upgrade
28+
* Fix #5286: Update Fabric8 OpenShift Model as per OpenShift 4.13.12
2829
* Fix #5373: Gradle base API based on v8.2.1
2930
* Fix #5401: Upgrade Fabric8 Kubernetes Model to Kubernetes v1.28.2
3031

kubernetes-model-generator/go.mod

Lines changed: 67 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@ require (
66
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.2.0
77
github.com/k8snetworkplumbingwg/whereabouts v0.4.3-0.20211129155010-abd29e856f36
88
github.com/metal3-io/baremetal-operator/apis v0.2.0
9-
github.com/openshift/api v0.0.0
10-
github.com/openshift/cloud-credential-operator v0.0.0-20211129235416-c4ce9b8b79de
11-
github.com/openshift/cluster-autoscaler-operator v0.0.1-0.20211120222321-da0812a49473
12-
github.com/openshift/cluster-network-operator v0.0.0-20211123023629-88b7cdc9034e
13-
github.com/openshift/cluster-node-tuning-operator v0.0.0-20211115083052-29e877edbbf1
14-
github.com/openshift/hive/apis v0.0.0-20220222213051-def9088fdb5a
9+
github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0-00010101000000-000000000000
10+
github.com/openshift/api v0.0.0-20231003083825-c3f7566f6ef6
11+
github.com/openshift/cloud-credential-operator v0.0.0-20230928214554-c98388e9e379
12+
github.com/openshift/cluster-autoscaler-operator v0.0.1-0.20230925164720-b85f20ceee19
13+
github.com/openshift/cluster-network-operator v0.0.0-20230929174123-e06f5c0b5651
14+
github.com/openshift/cluster-node-tuning-operator v0.0.0-20230929150138-890d5eefa956
15+
github.com/openshift/hive/apis v0.0.0-20230921195800-227c25916da4
1516
github.com/openshift/installer v0.9.0-master.0.20230306121016-3485fddca1c3
16-
github.com/openshift/machine-config-operator v0.0.1-0.20211201165713-c533e61a9e4f
17-
github.com/operator-framework/api v0.10.7
18-
github.com/operator-framework/operator-lifecycle-manager v0.19.1
19-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.57.0
17+
github.com/openshift/machine-config-operator v0.0.1-0.20230807154212-886c5c3fc7a9
18+
github.com/operator-framework/api v0.17.7
19+
github.com/operator-framework/operator-lifecycle-manager v0.22.0
20+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.68.0
2021
k8s.io/api v0.28.2
2122
k8s.io/apiextensions-apiserver v0.28.2
2223
k8s.io/apimachinery v0.28.2
@@ -31,11 +32,17 @@ require (
3132
require (
3233
github.com/PaesslerAG/gval v1.0.0 // indirect
3334
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
34-
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
35-
github.com/aws/aws-sdk-go v1.44.51 // indirect
35+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
36+
github.com/aws/aws-sdk-go v1.44.204 // indirect
37+
github.com/beorn7/perks v1.0.1 // indirect
3638
github.com/blang/semver v3.5.1+incompatible // indirect
3739
github.com/blang/semver/v4 v4.0.0 // indirect
38-
github.com/davecgh/go-spew v1.1.1 // indirect
40+
github.com/bshuster-repo/logrus-logstash-hook v1.1.0 // indirect
41+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
42+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
43+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
44+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
45+
github.com/fsnotify/fsnotify v1.6.0 // indirect
3946
github.com/go-errors/errors v1.4.2 // indirect
4047
github.com/go-logr/logr v1.2.4 // indirect
4148
github.com/go-logr/zapr v1.2.4 // indirect
@@ -45,47 +52,65 @@ require (
4552
github.com/gogo/protobuf v1.3.2 // indirect
4653
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4754
github.com/golang/protobuf v1.5.3 // indirect
55+
github.com/google/cel-go v0.16.1 // indirect
4856
github.com/google/gnostic-models v0.6.8 // indirect
4957
github.com/google/go-cmp v0.5.9 // indirect
5058
github.com/google/gofuzz v1.2.0 // indirect
51-
github.com/google/uuid v1.3.0 // indirect
59+
github.com/google/uuid v1.3.1 // indirect
5260
github.com/h2non/filetype v1.1.1 // indirect
5361
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
62+
github.com/imdario/mergo v0.3.16 // indirect
5463
github.com/josharian/intern v1.0.0 // indirect
5564
github.com/json-iterator/go v1.1.12 // indirect
5665
github.com/kdomanski/iso9660 v0.2.1 // indirect
5766
github.com/mailru/easyjson v0.7.7 // indirect
67+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5868
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.2.0 // indirect
69+
github.com/metal3-io/ip-address-manager/api v1.5.1 // indirect
5970
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6071
github.com/modern-go/reflect2 v1.0.2 // indirect
72+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6173
github.com/nutanix-cloud-native/prism-go-client v0.2.1-0.20220804130801-c8a253627c64 // indirect
62-
github.com/onsi/gomega v1.27.7 // indirect
63-
github.com/operator-framework/operator-registry v1.17.5 // indirect
74+
github.com/onsi/gomega v1.27.10 // indirect
75+
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87 // indirect
76+
github.com/operator-framework/operator-registry v1.29.0 // indirect
6477
github.com/pkg/errors v0.9.1 // indirect
65-
github.com/sirupsen/logrus v1.9.0 // indirect
66-
go.uber.org/atomic v1.10.0 // indirect
78+
github.com/prometheus/client_golang v1.16.0 // indirect
79+
github.com/prometheus/client_model v0.4.0 // indirect
80+
github.com/prometheus/common v0.44.0 // indirect
81+
github.com/prometheus/procfs v0.10.1 // indirect
82+
github.com/sirupsen/logrus v1.9.3 // indirect
83+
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
84+
github.com/stoewer/go-strcase v1.3.0 // indirect
6785
go.uber.org/multierr v1.11.0 // indirect
68-
go.uber.org/zap v1.24.0 // indirect
69-
golang.org/x/net v0.13.0 // indirect
70-
golang.org/x/oauth2 v0.8.0 // indirect
71-
golang.org/x/sys v0.10.0 // indirect
72-
golang.org/x/term v0.10.0 // indirect
73-
golang.org/x/text v0.11.0 // indirect
86+
go.uber.org/zap v1.25.0 // indirect
87+
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
88+
golang.org/x/mod v0.12.0 // indirect
89+
golang.org/x/net v0.15.0 // indirect
90+
golang.org/x/oauth2 v0.10.0 // indirect
91+
golang.org/x/sync v0.3.0 // indirect
92+
golang.org/x/sys v0.12.0 // indirect
93+
golang.org/x/term v0.12.0 // indirect
94+
golang.org/x/text v0.13.0 // indirect
7495
golang.org/x/time v0.3.0 // indirect
96+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7597
google.golang.org/appengine v1.6.7 // indirect
76-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
77-
google.golang.org/grpc v1.54.0 // indirect
78-
google.golang.org/protobuf v1.30.0 // indirect
98+
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
99+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
100+
google.golang.org/grpc v1.55.0 // indirect
101+
google.golang.org/protobuf v1.31.0 // indirect
79102
gopkg.in/inf.v0 v0.9.1 // indirect
80103
gopkg.in/yaml.v2 v2.4.0 // indirect
81104
gopkg.in/yaml.v3 v3.0.1 // indirect
105+
k8s.io/component-base v0.28.2 // indirect
82106
k8s.io/klog/v2 v2.100.1 // indirect
83107
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
84-
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
85-
sigs.k8s.io/controller-runtime v0.15.0 // indirect
108+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
109+
sigs.k8s.io/cluster-api v1.5.2 // indirect
110+
sigs.k8s.io/controller-runtime v0.16.2 // indirect
86111
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
87112
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
88-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
113+
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
89114
sigs.k8s.io/yaml v1.3.0 // indirect
90115
)
91116

@@ -95,25 +120,26 @@ replace (
95120
github.com/containerd/containerd => github.com/containerd/containerd v1.5.13
96121
github.com/docker/distribution => github.com/docker/distribution v2.8.0+incompatible
97122
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
98-
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20230531194024-8dde0991ffdd
99-
github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20230531194024-8dde0991ffdd
123+
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20231002072530-755bd1d88f04
124+
github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20231002072530-755bd1d88f04
125+
github.com/metal3-io/cluster-api-provider-metal3/api => github.com/metal3-io/cluster-api-provider-metal3/api v1.5.1
100126
github.com/mikefarah/yaml/v2 => gopkg.in/yaml.v2 v2.4.0
101127
github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2
102128
github.com/openshift/api => github.com/openshift/api v0.0.0-20230615141659-a6fbaf36017d
103-
github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20220928142635-a40422bdea61
104-
github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20220928142635-a40422bdea61
129+
github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20231001134623-54b30e6f7d8e
130+
github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20231001134623-54b30e6f7d8e
105131
github.com/terraform-providers/terraform-provider-aws => github.com/openshift/terraform-provider-aws v1.60.1-0.20211215220004-24df6d73af46
106132
github.com/terraform-providers/terraform-provider-ignition/v2 => github.com/community-terraform-providers/terraform-provider-ignition/v2 v2.1.0
107133
k8s.io/client-go => k8s.io/client-go v0.28.2
108-
k8s.io/cloud-provider-vsphere => github.com/openshift/cloud-provider-vsphere v1.19.1-0.20211222185833-7829863d0558
134+
k8s.io/cloud-provider-vsphere => github.com/openshift/cloud-provider-vsphere v1.19.1-0.20230928092837-f518c23f1b0d
109135
k8s.io/component-helpers => k8s.io/component-helpers v0.28.2
110136
k8s.io/controller-manager => k8s.io/controller-manager v0.28.2
111137
k8s.io/mount-utils => k8s.io/mount-utils v0.28.2
112-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.5
113-
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201125052318-b85a18cbf338
114-
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.0.0-20210209143830-3442c7a36c1e
115-
sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20230503161017-b9a504cea2c0
116-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.15.0
138+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.2
139+
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20230919101006-78c1a04f0a1c
140+
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20230918123958-2aec6b9229c3
141+
sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20230919060426-51224b6ed0c3
142+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.2
117143
)
118144

119145
exclude (
@@ -139,6 +165,7 @@ exclude (
139165
k8s.io/kube-scheduler v0.0.0
140166
k8s.io/kubectl v0.0.0
141167
k8s.io/kubelet v0.0.0
168+
k8s.io/kubernetes v0.0.0
142169
k8s.io/legacy-cloud-providers v0.0.0
143170
k8s.io/metrics v0.0.0
144171
k8s.io/sample-apiserver v0.0.0

0 commit comments

Comments
 (0)