Skip to content

Commit

Permalink
Fix fabric8io#3505: Update OpenShift Models to latest available versions
Browse files Browse the repository at this point in the history
Update OpenShift Model Go dependencies to the latest available versions.

Signed-off-by: Rohan Kumar <[email protected]>
  • Loading branch information
rohanKanojia committed Dec 6, 2021
1 parent 6217d05 commit c24e19c
Show file tree
Hide file tree
Showing 120 changed files with 13,165 additions and 330 deletions.
47 changes: 21 additions & 26 deletions kubernetes-model-generator/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,34 @@ module github.com/fabric8io/kubernetes-client/kubernetes-model-generator
go 1.14

require (
github.com/Microsoft/go-winio v0.4.15 // indirect
github.com/Microsoft/hcsshim v0.8.10-0.20200715222032-5eafd1556990 // indirect
github.com/containerd/containerd v1.4.4 // indirect
github.com/containerd/ttrpc v1.0.2 // indirect
github.com/containerd/typeurl v1.0.1 // indirect
github.com/docker/docker v20.10.2+incompatible // indirect
github.com/dougbtv/whereabouts v0.0.0-20200723172855-1e6ed41d0b3c
github.com/gorilla/mux v1.8.0 // indirect
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.0
github.com/metal3-io/baremetal-operator/apis v0.0.0-20210608100644-f5228fa38953
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d // indirect
github.com/openshift/api v0.0.0-20210526151222-14f26e4285a4
github.com/openshift/cloud-credential-operator v0.0.0-20210604234117-8814b05f76c3
github.com/openshift/cluster-autoscaler-operator v0.0.1-0.20210519002000-fdae5baad94f
github.com/openshift/cluster-network-operator v0.0.0-20210607181852-1ae6dc1b00c5
github.com/openshift/cluster-node-tuning-operator v0.0.0-20210524233058-db8189430089
github.com/openshift/machine-api-operator v0.2.1-0.20210513225032-5644b5803418
github.com/openshift/machine-config-operator v0.0.1-0.20210522071823-15494d85812c
github.com/operator-framework/api v0.9.1
github.com/operator-framework/operator-lifecycle-manager v0.18.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.47.1
golang.org/x/oauth2 v0.0.0-20210210192628-66670185b0cd // indirect
k8s.io/api v0.22.1
k8s.io/apiextensions-apiserver v0.22.1
k8s.io/apimachinery v0.22.1
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-20211201170610-92ffa60c683d
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/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/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.22.3
k8s.io/apiextensions-apiserver v0.22.3
k8s.io/apimachinery v0.22.3
k8s.io/client-go v12.0.0+incompatible
k8s.io/kube-aggregator v0.22.1
k8s.io/metrics v0.22.1
sigs.k8s.io/kube-storage-version-migrator v0.0.3
sigs.k8s.io/kube-storage-version-migrator v0.0.5
)

replace (
bitbucket.org/ww/goautoneg => github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d
github.com/mikefarah/yaml/v2 => gopkg.in/yaml.v2 v2.4.0
github.com/openshift/api => github.com/openshift/api v0.0.0-20210601190906-e782d76c7bc4
github.com/openshift/image-registry => github.com/openshift/image-registry v0.0.0-20200311172808-7511ca65e07b
github.com/openshift/api => github.com/openshift/api v0.0.0-20211201215911-5a82bae32e46
k8s.io/client-go => k8s.io/client-go v0.22.1
k8s.io/component-helpers => k8s.io/component-helpers v0.22.1
k8s.io/controller-manager => k8s.io/controller-manager v0.22.1
Expand All @@ -48,6 +40,9 @@ replace (
)

exclude (
github.com/golangci/golangci-lint v1.42.1
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.0.0
github.com/mikefarah/yaml/v2 v2.4.0
k8s.io/api v0.0.0
k8s.io/apiextensions-apiserver v0.0.0
k8s.io/apimachinery v0.0.0
Expand Down
780 changes: 637 additions & 143 deletions kubernetes-model-generator/go.sum

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@

package io.fabric8.openshift.api.model.console.v1alpha1;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.fabric8.kubernetes.api.model.Container;
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.KubernetesResource;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
import io.fabric8.kubernetes.api.model.ResourceRequirements;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import lombok.EqualsAndHashCode;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;

@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
"apiVersion",
"kind",
"metadata",
"services"
})
@ToString
@EqualsAndHashCode
@Setter
@Accessors(prefix = {
"_",
""
})
@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
@BuildableReference(ObjectMeta.class),
@BuildableReference(LabelSelector.class),
@BuildableReference(Container.class),
@BuildableReference(PodTemplateSpec.class),
@BuildableReference(ResourceRequirements.class),
@BuildableReference(IntOrString.class),
@BuildableReference(ObjectReference.class),
@BuildableReference(LocalObjectReference.class),
@BuildableReference(PersistentVolumeClaim.class)
})
public class ConsolePluginProxy implements KubernetesResource
{

@JsonProperty("services")
private List<ConsolePluginProxyService> services = new ArrayList<ConsolePluginProxyService>();
@JsonIgnore
private Map<String, Object> additionalProperties = new HashMap<String, Object>();

/**
* No args constructor for use in serialization
*
*/
public ConsolePluginProxy() {
}

/**
*
* @param services
*/
public ConsolePluginProxy(List<ConsolePluginProxyService> services) {
super();
this.services = services;
}

@JsonProperty("services")
public List<ConsolePluginProxyService> getServices() {
return services;
}

@JsonProperty("services")
public void setServices(List<ConsolePluginProxyService> services) {
this.services = services;
}

@JsonAnyGetter
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
}

@JsonAnySetter
public void setAdditionalProperty(String name, Object value) {
this.additionalProperties.put(name, value);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@

package io.fabric8.openshift.api.model.console.v1alpha1;

import java.util.HashMap;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.fabric8.kubernetes.api.model.Container;
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.KubernetesResource;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
import io.fabric8.kubernetes.api.model.ResourceRequirements;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import lombok.EqualsAndHashCode;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;

@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
"apiVersion",
"kind",
"metadata",
"authorize",
"caCertificate",
"name",
"namespace",
"port"
})
@ToString
@EqualsAndHashCode
@Setter
@Accessors(prefix = {
"_",
""
})
@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
@BuildableReference(ObjectMeta.class),
@BuildableReference(LabelSelector.class),
@BuildableReference(Container.class),
@BuildableReference(PodTemplateSpec.class),
@BuildableReference(ResourceRequirements.class),
@BuildableReference(IntOrString.class),
@BuildableReference(ObjectReference.class),
@BuildableReference(LocalObjectReference.class),
@BuildableReference(PersistentVolumeClaim.class)
})
public class ConsolePluginProxyService implements KubernetesResource
{

@JsonProperty("authorize")
private Boolean authorize;
@JsonProperty("caCertificate")
private String caCertificate;
@JsonProperty("name")
private String name;
@JsonProperty("namespace")
private String namespace;
@JsonProperty("port")
private Integer port;
@JsonIgnore
private Map<String, Object> additionalProperties = new HashMap<String, Object>();

/**
* No args constructor for use in serialization
*
*/
public ConsolePluginProxyService() {
}

/**
*
* @param port
* @param name
* @param namespace
* @param authorize
* @param caCertificate
*/
public ConsolePluginProxyService(Boolean authorize, String caCertificate, String name, String namespace, Integer port) {
super();
this.authorize = authorize;
this.caCertificate = caCertificate;
this.name = name;
this.namespace = namespace;
this.port = port;
}

@JsonProperty("authorize")
public Boolean getAuthorize() {
return authorize;
}

@JsonProperty("authorize")
public void setAuthorize(Boolean authorize) {
this.authorize = authorize;
}

@JsonProperty("caCertificate")
public String getCaCertificate() {
return caCertificate;
}

@JsonProperty("caCertificate")
public void setCaCertificate(String caCertificate) {
this.caCertificate = caCertificate;
}

@JsonProperty("name")
public String getName() {
return name;
}

@JsonProperty("name")
public void setName(String name) {
this.name = name;
}

@JsonProperty("namespace")
public String getNamespace() {
return namespace;
}

@JsonProperty("namespace")
public void setNamespace(String namespace) {
this.namespace = namespace;
}

@JsonProperty("port")
public Integer getPort() {
return port;
}

@JsonProperty("port")
public void setPort(Integer port) {
this.port = port;
}

@JsonAnyGetter
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
}

@JsonAnySetter
public void setAdditionalProperty(String name, Object value) {
this.additionalProperties.put(name, value);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"kind",
"metadata",
"displayName",
"proxy",
"service"
})
@ToString
Expand All @@ -59,6 +60,8 @@ public class ConsolePluginSpec implements KubernetesResource

@JsonProperty("displayName")
private String displayName;
@JsonProperty("proxy")
private ConsolePluginProxy proxy;
@JsonProperty("service")
private ConsolePluginService service;
@JsonIgnore
Expand All @@ -73,12 +76,14 @@ public ConsolePluginSpec() {

/**
*
* @param proxy
* @param displayName
* @param service
*/
public ConsolePluginSpec(String displayName, ConsolePluginService service) {
public ConsolePluginSpec(String displayName, ConsolePluginProxy proxy, ConsolePluginService service) {
super();
this.displayName = displayName;
this.proxy = proxy;
this.service = service;
}

Expand All @@ -92,6 +97,16 @@ public void setDisplayName(String displayName) {
this.displayName = displayName;
}

@JsonProperty("proxy")
public ConsolePluginProxy getProxy() {
return proxy;
}

@JsonProperty("proxy")
public void setProxy(ConsolePluginProxy proxy) {
this.proxy = proxy;
}

@JsonProperty("service")
public ConsolePluginService getService() {
return service;
Expand Down
Loading

0 comments on commit c24e19c

Please sign in to comment.