Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): bump istio.io/client-go from 1.23.2 to 1.24.0 in /kubernetes-model-generator/openapi/generator #6596

Merged
merged 2 commits into from
Nov 15, 2024
Merged

chore(deps): bump istio.io/client-go from 1.23.2 to 1.24.0 in /kubernetes-model-generator/openapi/generator #6596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e42d6b7
chore(deps): bump istio.io/client-go
dependabot[bot] Nov 14, 2024
d932278
feat(openapi): regenerate model for istio.io/client-go 1.24.0
manusa Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion ...src/generated/java/io/fabric8/istio/api/api/networking/v1alpha3/LoadBalancerSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
@JsonPropertyOrder({
"LbPolicy",
"localityLbSetting",
"warmup",
"warmupDurationSecs"
})
@ToString
Expand Down Expand Up @@ -70,6 +71,8 @@ public class LoadBalancerSettings implements Editable<LoadBalancerSettingsBuilde
private IsLoadBalancerSettingsLbPolicy lbPolicy;
@JsonProperty("localityLbSetting")
private LocalityLoadBalancerSetting localityLbSetting;
@JsonProperty("warmup")
private WarmupConfiguration warmup;
@JsonProperty("warmupDurationSecs")
private String warmupDurationSecs;
@JsonIgnore
Expand All @@ -82,10 +85,11 @@ public class LoadBalancerSettings implements Editable<LoadBalancerSettingsBuilde
public LoadBalancerSettings() {
}

public LoadBalancerSettings(IsLoadBalancerSettingsLbPolicy lbPolicy, LocalityLoadBalancerSetting localityLbSetting, String warmupDurationSecs) {
public LoadBalancerSettings(IsLoadBalancerSettingsLbPolicy lbPolicy, LocalityLoadBalancerSetting localityLbSetting, WarmupConfiguration warmup, String warmupDurationSecs) {
super();
this.lbPolicy = lbPolicy;
this.localityLbSetting = localityLbSetting;
this.warmup = warmup;
this.warmupDurationSecs = warmupDurationSecs;
}

Expand All @@ -110,6 +114,16 @@ public void setLocalityLbSetting(LocalityLoadBalancerSetting localityLbSetting)
this.localityLbSetting = localityLbSetting;
}

@JsonProperty("warmup")
public WarmupConfiguration getWarmup() {
return warmup;
}

@JsonProperty("warmup")
public void setWarmup(WarmupConfiguration warmup) {
this.warmup = warmup;
}

@JsonProperty("warmupDurationSecs")
public String getWarmupDurationSecs() {
return warmupDurationSecs;
Expand Down
144 changes: 144 additions & 0 deletions .../src/generated/java/io/fabric8/istio/api/api/networking/v1alpha3/WarmupConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@

package io.fabric8.istio.api.api.networking.v1alpha3;

import java.util.LinkedHashMap;
import java.util.Map;
import javax.annotation.Generated;
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.builder.Editable;
import io.fabric8.kubernetes.api.model.Container;
import io.fabric8.kubernetes.api.model.ContainerPort;
import io.fabric8.kubernetes.api.model.EnvVar;
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.fabric8.kubernetes.api.model.Volume;
import io.fabric8.kubernetes.api.model.VolumeMount;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import lombok.experimental.Accessors;

@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
"aggression",
"duration",
"minimumPercent"
})
@ToString
@EqualsAndHashCode
@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),
@BuildableReference(EnvVar.class),
@BuildableReference(ContainerPort.class),
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@Generated("jsonschema2pojo")
public class WarmupConfiguration implements Editable<WarmupConfigurationBuilder> , KubernetesResource
{

@JsonProperty("aggression")
private Double aggression;
@JsonProperty("duration")
private String duration;
@JsonProperty("minimumPercent")
private Double minimumPercent;
@JsonIgnore
private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();

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

public WarmupConfiguration(Double aggression, String duration, Double minimumPercent) {
super();
this.aggression = aggression;
this.duration = duration;
this.minimumPercent = minimumPercent;
}

@JsonProperty("aggression")
public Double getAggression() {
return aggression;
}

@JsonProperty("aggression")
public void setAggression(Double aggression) {
this.aggression = aggression;
}

@JsonProperty("duration")
public String getDuration() {
return duration;
}

@JsonProperty("duration")
public void setDuration(String duration) {
this.duration = duration;
}

@JsonProperty("minimumPercent")
public Double getMinimumPercent() {
return minimumPercent;
}

@JsonProperty("minimumPercent")
public void setMinimumPercent(Double minimumPercent) {
this.minimumPercent = minimumPercent;
}

@JsonIgnore
public WarmupConfigurationBuilder edit() {
return new WarmupConfigurationBuilder(this);
}

@JsonIgnore
public WarmupConfigurationBuilder toBuilder() {
return edit();
}

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

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

public void setAdditionalProperties(Map<String, Object> additionalProperties) {
this.additionalProperties = additionalProperties;
}

}
4 changes: 2 additions & 2 deletions kubernetes-model-generator/openapi/generator/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
github.com/spf13/cobra v1.8.1
github.com/tektoncd/pipeline v0.65.1
github.com/tektoncd/triggers v0.30.0
istio.io/client-go v1.23.2
istio.io/client-go v1.24.0
k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery v0.31.2
Expand Down Expand Up @@ -211,7 +211,7 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
istio.io/api v1.23.2 // indirect
istio.io/api v1.24.0-rc.0.0.20241101200753-9397ebf09c3a // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad // indirect
Expand Down
8 changes: 4 additions & 4 deletions kubernetes-model-generator/openapi/generator/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1955,10 +1955,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
istio.io/api v1.23.2 h1:FvWi7GC+rWD60/ZFPuulX/h3k+f2Q9qot3dP8CIL8Ss=
istio.io/api v1.23.2/go.mod h1:QPSTGXuIQdnZFEm3myf9NZ5uBMwCdJWUvfj9ZZ+2oBM=
istio.io/client-go v1.23.2 h1:BIt6A+KaUOFin3SzXiDq2Fr/TMBev1+c836R0BfUfhU=
istio.io/client-go v1.23.2/go.mod h1:E08wpMtUulJk2tlWOCUVakjy1bKFxUNm22tM1R1QY0Y=
istio.io/api v1.24.0-rc.0.0.20241101200753-9397ebf09c3a h1:mg5/FHlPjNxwIdw0LKyLWH3kGpPtLPvbwUII1YdJCoU=
istio.io/api v1.24.0-rc.0.0.20241101200753-9397ebf09c3a/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I=
istio.io/client-go v1.24.0 h1:30Qmx12lJCB5xeJuyodPSWh848b2PvgCubdPTazG1eU=
istio.io/client-go v1.24.0/go.mod h1:sCDBDJWQGJQz/1t3CHwUTDE5V7Nk6pFFkqBwhIg+LrI=
k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
k8s.io/apiextensions-apiserver v0.21.4/go.mod h1:OoC8LhI9LnV+wKjZkXIBbLUwtnOGJiTRE33qctH5CIk=
Expand Down
16 changes: 15 additions & 1 deletion ...-model-generator/openapi/maven-plugin/src/it/istio/expected/LoadBalancerSettings.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import lombok.experimental.Accessors;
@JsonPropertyOrder({
"LbPolicy",
"localityLbSetting",
"warmup",
"warmupDurationSecs"
})
@ToString
Expand Down Expand Up @@ -70,6 +71,8 @@ public class LoadBalancerSettings implements Editable<LoadBalancerSettingsBuilde
private IsLoadBalancerSettingsLbPolicy lbPolicy;
@JsonProperty("localityLbSetting")
private LocalityLoadBalancerSetting localityLbSetting;
@JsonProperty("warmup")
private WarmupConfiguration warmup;
@JsonProperty("warmupDurationSecs")
private String warmupDurationSecs;
@JsonIgnore
Expand All @@ -82,10 +85,11 @@ public class LoadBalancerSettings implements Editable<LoadBalancerSettingsBuilde
public LoadBalancerSettings() {
}

public LoadBalancerSettings(IsLoadBalancerSettingsLbPolicy lbPolicy, LocalityLoadBalancerSetting localityLbSetting, String warmupDurationSecs) {
public LoadBalancerSettings(IsLoadBalancerSettingsLbPolicy lbPolicy, LocalityLoadBalancerSetting localityLbSetting, WarmupConfiguration warmup, String warmupDurationSecs) {
super();
this.lbPolicy = lbPolicy;
this.localityLbSetting = localityLbSetting;
this.warmup = warmup;
this.warmupDurationSecs = warmupDurationSecs;
}

Expand All @@ -110,6 +114,16 @@ public class LoadBalancerSettings implements Editable<LoadBalancerSettingsBuilde
this.localityLbSetting = localityLbSetting;
}

@JsonProperty("warmup")
public WarmupConfiguration getWarmup() {
return warmup;
}

@JsonProperty("warmup")
public void setWarmup(WarmupConfiguration warmup) {
this.warmup = warmup;
}

@JsonProperty("warmupDurationSecs")
public String getWarmupDurationSecs() {
return warmupDurationSecs;
Expand Down
Loading
Loading