Skip to content

Commit

Permalink
chore (kubernetes-model-generator) : Update Kubernetes Model to v1.27…
Browse files Browse the repository at this point in the history
….2 (fabric8io#5056)

+ Update Kubernetes Model related go packages to v0.27.2
+ Upgrading Kubernetes go packages also started breaking builds for
  openshift model modules, therefore openshift model has also been
  updated

Signed-off-by: Rohan Kumar <rohaan@redhat.com>
  • Loading branch information
rohanKanojia committed Jun 19, 2023
1 parent 8b7f467 commit 082aded
Show file tree
Hide file tree
Showing 362 changed files with 36,346 additions and 2,860 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
*/
package io.fabric8.kubernetes.client;

import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingList;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimList;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateList;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassList;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimList;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.Resource;

public interface V1Alpha1DynamicResourceAllocationAPIGroupDSL extends Client {
public interface V1Alpha2DynamicResourceAllocationAPIGroupDSL extends Client {
/**
* API entrypoint for resource.k8s.io/v1alpha1 ResourceClass
*
Expand All @@ -40,7 +40,7 @@ public interface V1Alpha1DynamicResourceAllocationAPIGroupDSL extends Client {
*
* @return {@link MixedOperation} for PodScheduling
*/
MixedOperation<PodScheduling, PodSchedulingList, Resource<PodScheduling>> podSchedulings();
MixedOperation<PodSchedulingContext, PodSchedulingContextList, Resource<PodSchedulingContext>> podSchedulings();

/**
* API entrypoint for resource.k8s.io/v1alpha1 ResourceClaim
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
package io.fabric8.kubernetes.client.dsl;

import io.fabric8.kubernetes.client.Client;
import io.fabric8.kubernetes.client.V1Alpha1DynamicResourceAllocationAPIGroupDSL;
import io.fabric8.kubernetes.client.V1Alpha2DynamicResourceAllocationAPIGroupDSL;

public interface DynamicResourceAllocationAPIGroupDSL extends Client {
V1Alpha1DynamicResourceAllocationAPIGroupDSL v1alpha1();
V1Alpha2DynamicResourceAllocationAPIGroupDSL v1alpha2();
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package io.fabric8.kubernetes.client.impl;

import io.fabric8.kubernetes.client.V1Alpha1DynamicResourceAllocationAPIGroupDSL;
import io.fabric8.kubernetes.client.V1Alpha2DynamicResourceAllocationAPIGroupDSL;
import io.fabric8.kubernetes.client.dsl.DynamicResourceAllocationAPIGroupDSL;
import io.fabric8.kubernetes.client.extension.ClientAdapter;

Expand All @@ -27,7 +27,7 @@ public DynamicResourceAllocationAPIGroupClient newInstance() {
}

@Override
public V1Alpha1DynamicResourceAllocationAPIGroupDSL v1alpha1() {
return adapt(V1Alpha1DynamicResourceAllocationAPIGroupClient.class);
public V1Alpha2DynamicResourceAllocationAPIGroupDSL v1alpha2() {
return adapt(V1Alpha2DynamicResourceAllocationAPIGroupClient.class);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
import io.fabric8.kubernetes.client.RequestConfig;
import io.fabric8.kubernetes.client.V1AdmissionRegistrationAPIGroupDSL;
import io.fabric8.kubernetes.client.V1Alpha1AdmissionRegistrationAPIGroupDSL;
import io.fabric8.kubernetes.client.V1Alpha1DynamicResourceAllocationAPIGroupDSL;
import io.fabric8.kubernetes.client.V1Alpha2DynamicResourceAllocationAPIGroupDSL;
import io.fabric8.kubernetes.client.V1ApiextensionAPIGroupDSL;
import io.fabric8.kubernetes.client.V1AuthenticationAPIGroupDSL;
import io.fabric8.kubernetes.client.V1AuthorizationAPIGroupDSL;
Expand Down Expand Up @@ -246,8 +246,8 @@ public KubernetesClientImpl(HttpClient httpClient, Config config, ExecutorSuppli
this.getAdapters().registerClient(V1DiscoveryAPIGroupDSL.class, new V1DiscoveryAPIGroupClient());
this.getAdapters().registerClient(DynamicResourceAllocationAPIGroupDSL.class,
new DynamicResourceAllocationAPIGroupClient());
this.getAdapters().registerClient(V1Alpha1DynamicResourceAllocationAPIGroupDSL.class,
new V1Alpha1DynamicResourceAllocationAPIGroupClient());
this.getAdapters().registerClient(V1Alpha2DynamicResourceAllocationAPIGroupDSL.class,
new V1Alpha2DynamicResourceAllocationAPIGroupClient());
this.getAdapters().registerClient(CertificatesAPIGroupDSL.class, new CertificatesAPIGroupClient());
this.getAdapters().registerClient(V1CertificatesAPIGroupDSL.class, new V1CertificatesAPIGroupClient());
this.getAdapters().registerClient(V1beta1CertificatesAPIGroupDSL.class, new V1beta1CertificatesAPIGroupClient());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@
*/
package io.fabric8.kubernetes.client.impl;

import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingList;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimList;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateList;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass;
import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassList;
import io.fabric8.kubernetes.client.V1Alpha1DynamicResourceAllocationAPIGroupDSL;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimList;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass;
import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList;
import io.fabric8.kubernetes.client.V1Alpha2DynamicResourceAllocationAPIGroupDSL;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
import io.fabric8.kubernetes.client.extension.ClientAdapter;

public class V1Alpha1DynamicResourceAllocationAPIGroupClient extends
ClientAdapter<V1Alpha1DynamicResourceAllocationAPIGroupClient> implements V1Alpha1DynamicResourceAllocationAPIGroupDSL {
public class V1Alpha2DynamicResourceAllocationAPIGroupClient extends
ClientAdapter<V1Alpha2DynamicResourceAllocationAPIGroupClient> implements V1Alpha2DynamicResourceAllocationAPIGroupDSL {
@Override
public V1Alpha1DynamicResourceAllocationAPIGroupClient newInstance() {
return new V1Alpha1DynamicResourceAllocationAPIGroupClient();
public V1Alpha2DynamicResourceAllocationAPIGroupClient newInstance() {
return new V1Alpha2DynamicResourceAllocationAPIGroupClient();
}

@Override
Expand All @@ -42,8 +42,8 @@ public NonNamespaceOperation<ResourceClass, ResourceClassList, Resource<Resource
}

@Override
public MixedOperation<PodScheduling, PodSchedulingList, Resource<PodScheduling>> podSchedulings() {
return resources(PodScheduling.class, PodSchedulingList.class);
public MixedOperation<PodSchedulingContext, PodSchedulingContextList, Resource<PodSchedulingContext>> podSchedulings() {
return resources(PodSchedulingContext.class, PodSchedulingContextList.class);
}

@Override
Expand Down
111 changes: 25 additions & 86 deletions kubernetes-model-generator/go.mod
Original file line number Diff line number Diff line change
@@ -1,103 +1,39 @@
module github.com/fabric8io/kubernetes-client/kubernetes-model-generator

go 1.17
go 1.16

require (
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.2.0
github.com/k8snetworkplumbingwg/whereabouts v0.4.3-0.20211129155010-abd29e856f36
github.com/metal3-io/baremetal-operator/apis v0.0.0
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.0.0-20211201170610-92ffa60c683d // indirect
github.com/openshift/api v0.0.0-20211201215911-5a82bae32e46
github.com/metal3-io/baremetal-operator/apis v0.2.0
github.com/openshift/api v0.0.0
github.com/openshift/cloud-credential-operator v0.0.0-20211129235416-c4ce9b8b79de
github.com/openshift/cluster-autoscaler-operator v0.0.1-0.20211120222321-da0812a49473
github.com/openshift/cluster-network-operator v0.0.0-20211123023629-88b7cdc9034e
github.com/openshift/cluster-node-tuning-operator v0.0.0-20211115083052-29e877edbbf1
github.com/openshift/hive/apis v0.0.0-20211217134024-32a93e12e129
github.com/openshift/installer v0.9.0-master.0.20211223163410-37c09290190e
github.com/openshift/hive/apis v0.0.0-20220222213051-def9088fdb5a
github.com/openshift/installer v0.9.0-master.0.20230306121016-3485fddca1c3
github.com/openshift/machine-config-operator v0.0.1-0.20211201165713-c533e61a9e4f
github.com/operator-framework/api v0.10.7
github.com/operator-framework/operator-lifecycle-manager v0.19.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.52.1
k8s.io/api v0.26.0
k8s.io/apiextensions-apiserver v0.26.0
k8s.io/apimachinery v0.26.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.57.0
k8s.io/api v0.27.2
k8s.io/apiextensions-apiserver v0.27.2
k8s.io/apimachinery v0.27.2
k8s.io/client-go v12.0.0+incompatible
k8s.io/kube-aggregator v0.26.0
k8s.io/metrics v0.26.0
k8s.io/kube-aggregator v0.27.2
k8s.io/metrics v0.27.2
sigs.k8s.io/gateway-api v0.6.1
sigs.k8s.io/kube-storage-version-migrator v0.0.5
sigs.k8s.io/kustomize/api v0.13.1
)

require (
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/h2non/filetype v1.1.1 // indirect
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/gomega v1.24.1 // indirect
github.com/operator-framework/operator-registry v1.17.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/cobra v1.6.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/vmware/govmomi v0.24.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.26.0 // indirect
k8s.io/klog/v2 v2.90.0 // indirect
k8s.io/kube-openapi v0.0.0-20230228151317-19cbebb19cb7 // indirect
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
sigs.k8s.io/controller-runtime v0.12.1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/kyaml v0.14.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
sigs.k8s.io/controller-runtime v0.15.0 // indirect
)

replace (
Expand All @@ -106,22 +42,25 @@ replace (
github.com/containerd/containerd => github.com/containerd/containerd v1.5.13
github.com/docker/distribution => github.com/docker/distribution v2.8.0+incompatible
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20211201170610-92ffa60c683d
github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20211201170610-92ffa60c683d
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20230531194024-8dde0991ffdd
github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20230531194024-8dde0991ffdd
github.com/mikefarah/yaml/v2 => gopkg.in/yaml.v2 v2.4.0
github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2
github.com/openshift/api => github.com/openshift/api v0.0.0-20211201215911-5a82bae32e46
github.com/openshift/api => github.com/openshift/api v0.0.0-20230615141659-a6fbaf36017d
github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20220928142635-a40422bdea61
github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20220928142635-a40422bdea61
github.com/terraform-providers/terraform-provider-aws => github.com/openshift/terraform-provider-aws v1.60.1-0.20211215220004-24df6d73af46
github.com/terraform-providers/terraform-provider-ignition/v2 => github.com/community-terraform-providers/terraform-provider-ignition/v2 v2.1.0

k8s.io/client-go => k8s.io/client-go v0.26.0
k8s.io/component-helpers => k8s.io/component-helpers v0.26.0
k8s.io/controller-manager => k8s.io/controller-manager v0.26.0
k8s.io/mount-utils => k8s.io/mount-utils v0.26.0
k8s.io/client-go => k8s.io/client-go v0.27.2
k8s.io/cloud-provider-vsphere => github.com/openshift/cloud-provider-vsphere v1.19.1-0.20211222185833-7829863d0558
k8s.io/component-helpers => k8s.io/component-helpers v0.27.2
k8s.io/controller-manager => k8s.io/controller-manager v0.27.2
k8s.io/mount-utils => k8s.io/mount-utils v0.27.2
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.5
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201125052318-b85a18cbf338
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.0.0-20210209143830-3442c7a36c1e
sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20211111204942-611d320170af
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.1
sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20230503161017-b9a504cea2c0
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.15.0
)

exclude (
Expand Down
Loading

0 comments on commit 082aded

Please sign in to comment.