Skip to content

Commit 4adfb7c

Browse files
authored
feat(openapi): update istio from 1.27 to 1.28
1 parent 8a051a4 commit 4adfb7c

File tree

9 files changed

+284
-32
lines changed

9 files changed

+284
-32
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
2+
package io.fabric8.istio.api.api.networking.v1alpha3;
3+
4+
import java.util.LinkedHashMap;
5+
import java.util.Map;
6+
import javax.annotation.processing.Generated;
7+
import com.fasterxml.jackson.annotation.JsonAnyGetter;
8+
import com.fasterxml.jackson.annotation.JsonAnySetter;
9+
import com.fasterxml.jackson.annotation.JsonIgnore;
10+
import com.fasterxml.jackson.annotation.JsonInclude;
11+
import com.fasterxml.jackson.annotation.JsonProperty;
12+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
13+
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
14+
import io.fabric8.kubernetes.api.builder.Editable;
15+
import io.fabric8.kubernetes.api.model.Container;
16+
import io.fabric8.kubernetes.api.model.ContainerPort;
17+
import io.fabric8.kubernetes.api.model.EnvVar;
18+
import io.fabric8.kubernetes.api.model.IntOrString;
19+
import io.fabric8.kubernetes.api.model.KubernetesResource;
20+
import io.fabric8.kubernetes.api.model.LabelSelector;
21+
import io.fabric8.kubernetes.api.model.LocalObjectReference;
22+
import io.fabric8.kubernetes.api.model.ObjectMeta;
23+
import io.fabric8.kubernetes.api.model.ObjectReference;
24+
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
25+
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
26+
import io.fabric8.kubernetes.api.model.ResourceRequirements;
27+
import io.fabric8.kubernetes.api.model.Volume;
28+
import io.fabric8.kubernetes.api.model.VolumeMount;
29+
import io.sundr.builder.annotations.Buildable;
30+
import io.sundr.builder.annotations.BuildableReference;
31+
import lombok.EqualsAndHashCode;
32+
import lombok.ToString;
33+
import lombok.experimental.Accessors;
34+
35+
/**
36+
* Attribute defines an API for adding additional attributes for a HTTP cookie.
37+
*/
38+
@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
39+
@JsonInclude(JsonInclude.Include.NON_NULL)
40+
@JsonPropertyOrder({
41+
"name",
42+
"value"
43+
})
44+
@ToString
45+
@EqualsAndHashCode
46+
@Accessors(prefix = {
47+
"_",
48+
""
49+
})
50+
@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
51+
@BuildableReference(ObjectMeta.class),
52+
@BuildableReference(LabelSelector.class),
53+
@BuildableReference(Container.class),
54+
@BuildableReference(PodTemplateSpec.class),
55+
@BuildableReference(ResourceRequirements.class),
56+
@BuildableReference(IntOrString.class),
57+
@BuildableReference(ObjectReference.class),
58+
@BuildableReference(LocalObjectReference.class),
59+
@BuildableReference(PersistentVolumeClaim.class),
60+
@BuildableReference(EnvVar.class),
61+
@BuildableReference(ContainerPort.class),
62+
@BuildableReference(Volume.class),
63+
@BuildableReference(VolumeMount.class)
64+
})
65+
@Generated("io.fabric8.kubernetes.schema.generator.model.ModelGenerator")
66+
public class LoadBalancerSettingsConsistentHashLBHTTPCookieAttribute implements Editable<LoadBalancerSettingsConsistentHashLBHTTPCookieAttributeBuilder>, KubernetesResource
67+
{
68+
69+
@JsonProperty("name")
70+
private String name;
71+
@JsonProperty("value")
72+
private String value;
73+
@JsonIgnore
74+
private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
75+
76+
/**
77+
* No args constructor for use in serialization
78+
*/
79+
public LoadBalancerSettingsConsistentHashLBHTTPCookieAttribute() {
80+
}
81+
82+
public LoadBalancerSettingsConsistentHashLBHTTPCookieAttribute(String name, String value) {
83+
super();
84+
this.name = name;
85+
this.value = value;
86+
}
87+
88+
/**
89+
* The name of the cookie attribute.
90+
*/
91+
@JsonProperty("name")
92+
public String getName() {
93+
return name;
94+
}
95+
96+
/**
97+
* The name of the cookie attribute.
98+
*/
99+
@JsonProperty("name")
100+
public void setName(String name) {
101+
this.name = name;
102+
}
103+
104+
/**
105+
* The optional value of the cookie attribute.
106+
*/
107+
@JsonProperty("value")
108+
public String getValue() {
109+
return value;
110+
}
111+
112+
/**
113+
* The optional value of the cookie attribute.
114+
*/
115+
@JsonProperty("value")
116+
public void setValue(String value) {
117+
this.value = value;
118+
}
119+
120+
@JsonIgnore
121+
public LoadBalancerSettingsConsistentHashLBHTTPCookieAttributeBuilder edit() {
122+
return new LoadBalancerSettingsConsistentHashLBHTTPCookieAttributeBuilder(this);
123+
}
124+
125+
@JsonIgnore
126+
public LoadBalancerSettingsConsistentHashLBHTTPCookieAttributeBuilder toBuilder() {
127+
return edit();
128+
}
129+
130+
@JsonAnyGetter
131+
@JsonIgnore
132+
public Map<String, Object> getAdditionalProperties() {
133+
return this.additionalProperties;
134+
}
135+
136+
@JsonAnySetter
137+
public void setAdditionalProperty(String name, Object value) {
138+
this.additionalProperties.put(name, value);
139+
}
140+
141+
public void setAdditionalProperties(Map<String, Object> additionalProperties) {
142+
this.additionalProperties = additionalProperties;
143+
}
144+
145+
}

extensions/istio/model/src/generated/java/io/fabric8/istio/api/api/networking/v1alpha3/LoadBalancerSettingsConsistentHashLBHTTPCookie_.java

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11

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

4+
import java.util.ArrayList;
45
import java.util.LinkedHashMap;
6+
import java.util.List;
57
import java.util.Map;
68
import javax.annotation.processing.Generated;
79
import com.fasterxml.jackson.annotation.JsonAnyGetter;
@@ -38,6 +40,7 @@
3840
@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
3941
@JsonInclude(JsonInclude.Include.NON_NULL)
4042
@JsonPropertyOrder({
43+
"attributes",
4144
"name",
4245
"path",
4346
"ttl"
@@ -67,6 +70,9 @@
6770
public class LoadBalancerSettingsConsistentHashLBHTTPCookie_ implements Editable<LoadBalancerSettingsConsistentHashLBHTTPCookie_Builder>, KubernetesResource
6871
{
6972

73+
@JsonProperty("attributes")
74+
@JsonInclude(JsonInclude.Include.NON_EMPTY)
75+
private List<LoadBalancerSettingsConsistentHashLBHTTPCookieAttribute> attributes = new ArrayList<>();
7076
@JsonProperty("name")
7177
private String name;
7278
@JsonProperty("path")
@@ -82,13 +88,31 @@ public class LoadBalancerSettingsConsistentHashLBHTTPCookie_ implements Editable
8288
public LoadBalancerSettingsConsistentHashLBHTTPCookie_() {
8389
}
8490

85-
public LoadBalancerSettingsConsistentHashLBHTTPCookie_(String name, String path, String ttl) {
91+
public LoadBalancerSettingsConsistentHashLBHTTPCookie_(List<LoadBalancerSettingsConsistentHashLBHTTPCookieAttribute> attributes, String name, String path, String ttl) {
8692
super();
93+
this.attributes = attributes;
8794
this.name = name;
8895
this.path = path;
8996
this.ttl = ttl;
9097
}
9198

99+
/**
100+
* Additional attributes for the cookie. They will be used when generating a new cookie.
101+
*/
102+
@JsonProperty("attributes")
103+
@JsonInclude(JsonInclude.Include.NON_EMPTY)
104+
public List<LoadBalancerSettingsConsistentHashLBHTTPCookieAttribute> getAttributes() {
105+
return attributes;
106+
}
107+
108+
/**
109+
* Additional attributes for the cookie. They will be used when generating a new cookie.
110+
*/
111+
@JsonProperty("attributes")
112+
public void setAttributes(List<LoadBalancerSettingsConsistentHashLBHTTPCookieAttribute> attributes) {
113+
this.attributes = attributes;
114+
}
115+
92116
/**
93117
* Name of the cookie.
94118
*/

extensions/istio/model/src/generated/java/io/fabric8/istio/api/api/networking/v1alpha3/ServerTLSSettings.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
3838
@JsonInclude(JsonInclude.Include.NON_NULL)
3939
@JsonPropertyOrder({
40+
"caCertCredentialName",
4041
"caCertificates",
4142
"caCrl",
4243
"cipherSuites",
@@ -78,6 +79,8 @@
7879
public class ServerTLSSettings implements Editable<ServerTLSSettingsBuilder>, KubernetesResource
7980
{
8081

82+
@JsonProperty("caCertCredentialName")
83+
private String caCertCredentialName;
8184
@JsonProperty("caCertificates")
8285
private String caCertificates;
8386
@JsonProperty("caCrl")
@@ -123,8 +126,9 @@ public class ServerTLSSettings implements Editable<ServerTLSSettingsBuilder>, Ku
123126
public ServerTLSSettings() {
124127
}
125128

126-
public ServerTLSSettings(String caCertificates, String caCrl, List<String> cipherSuites, String credentialName, List<String> credentialNames, Boolean httpsRedirect, ServerTLSSettingsTLSProtocol maxProtocolVersion, ServerTLSSettingsTLSProtocol minProtocolVersion, ServerTLSSettingsTLSmode mode, String privateKey, String serverCertificate, List<String> subjectAltNames, List<ServerTLSSettingsTLSCertificate> tlsCertificates, List<String> verifyCertificateHash, List<String> verifyCertificateSpki) {
129+
public ServerTLSSettings(String caCertCredentialName, String caCertificates, String caCrl, List<String> cipherSuites, String credentialName, List<String> credentialNames, Boolean httpsRedirect, ServerTLSSettingsTLSProtocol maxProtocolVersion, ServerTLSSettingsTLSProtocol minProtocolVersion, ServerTLSSettingsTLSmode mode, String privateKey, String serverCertificate, List<String> subjectAltNames, List<ServerTLSSettingsTLSCertificate> tlsCertificates, List<String> verifyCertificateHash, List<String> verifyCertificateSpki) {
127130
super();
131+
this.caCertCredentialName = caCertCredentialName;
128132
this.caCertificates = caCertificates;
129133
this.caCrl = caCrl;
130134
this.cipherSuites = cipherSuites;
@@ -142,6 +146,22 @@ public ServerTLSSettings(String caCertificates, String caCrl, List<String> ciphe
142146
this.verifyCertificateSpki = verifyCertificateSpki;
143147
}
144148

149+
/**
150+
* For mutual TLS, the name of the secret or the configmap that holds CA certificates. Takes precedence over CA certificates in the Secret referenced with `credentialName(s)`.
151+
*/
152+
@JsonProperty("caCertCredentialName")
153+
public String getCaCertCredentialName() {
154+
return caCertCredentialName;
155+
}
156+
157+
/**
158+
* For mutual TLS, the name of the secret or the configmap that holds CA certificates. Takes precedence over CA certificates in the Secret referenced with `credentialName(s)`.
159+
*/
160+
@JsonProperty("caCertCredentialName")
161+
public void setCaCertCredentialName(String caCertCredentialName) {
162+
this.caCertCredentialName = caCertCredentialName;
163+
}
164+
145165
/**
146166
* REQUIRED if mode is `MUTUAL` or `OPTIONAL_MUTUAL`. The path to a file containing certificate authority certificates to use in verifying a presented client side certificate.
147167
*/

0 commit comments

Comments
 (0)