Skip to content

Commit 125008a

Browse files
dependabot[bot]manusa
dependabot[bot]
and
manusa
authored
chore(deps): bump github.com/cert-manager/cert-manager from 1.16.3 to 1.17.0 in /kubernetes-model-generator/openapi/generator (6855)
chore(deps): bump github.com/cert-manager/cert-manager Bumps [github.com/cert-manager/cert-manager](https://github.com/cert-manager/cert-manager) from 1.16.3 to 1.17.0. - [Release notes](https://github.com/cert-manager/cert-manager/releases) - [Changelog](https://github.com/cert-manager/cert-manager/blob/master/RELEASE.md) - [Commits](cert-manager/cert-manager@v1.16.3...v1.17.0) --- updated-dependencies: - dependency-name: github.com/cert-manager/cert-manager dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> --- feat(openapi): regenerate model for github.com/cert-manager/cert-manager 1.17.0 Signed-off-by: Marc Nuri <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marc Nuri <[email protected]>
1 parent b7c4f8a commit 125008a

File tree

6 files changed

+122
-50
lines changed

6 files changed

+122
-50
lines changed

‎extensions/certmanager/model/src/generated/java/io/fabric8/certmanager/api/model/acme/v1/AzureManagedIdentity.java

+22-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
@JsonInclude(JsonInclude.Include.NON_NULL)
4040
@JsonPropertyOrder({
4141
"clientID",
42-
"resourceID"
42+
"resourceID",
43+
"tenantID"
4344
})
4445
@ToString
4546
@EqualsAndHashCode
@@ -70,6 +71,8 @@ public class AzureManagedIdentity implements Editable<AzureManagedIdentityBuilde
7071
private String clientID;
7172
@JsonProperty("resourceID")
7273
private String resourceID;
74+
@JsonProperty("tenantID")
75+
private String tenantID;
7376
@JsonIgnore
7477
private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
7578

@@ -79,10 +82,11 @@ public class AzureManagedIdentity implements Editable<AzureManagedIdentityBuilde
7982
public AzureManagedIdentity() {
8083
}
8184

82-
public AzureManagedIdentity(String clientID, String resourceID) {
85+
public AzureManagedIdentity(String clientID, String resourceID, String tenantID) {
8386
super();
8487
this.clientID = clientID;
8588
this.resourceID = resourceID;
89+
this.tenantID = tenantID;
8690
}
8791

8892
/**
@@ -117,6 +121,22 @@ public void setResourceID(String resourceID) {
117121
this.resourceID = resourceID;
118122
}
119123

124+
/**
125+
* tenant ID of the managed identity, can not be used at the same time as resourceID
126+
*/
127+
@JsonProperty("tenantID")
128+
public String getTenantID() {
129+
return tenantID;
130+
}
131+
132+
/**
133+
* tenant ID of the managed identity, can not be used at the same time as resourceID
134+
*/
135+
@JsonProperty("tenantID")
136+
public void setTenantID(String tenantID) {
137+
this.tenantID = tenantID;
138+
}
139+
120140
@JsonIgnore
121141
public AzureManagedIdentityBuilder edit() {
122142
return new AzureManagedIdentityBuilder(this);

‎extensions/certmanager/model/src/generated/java/io/fabric8/certmanager/api/model/v1/JKSKeystore.java

+26-6
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@
3434
import lombok.experimental.Accessors;
3535

3636
/**
37-
* JKS configures options for storing a JKS keystore in the `spec.secretName` Secret resource.
37+
* JKS configures options for storing a JKS keystore in the target secret. Either PasswordSecretRef or Password must be provided.
3838
*/
3939
@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
4040
@JsonInclude(JsonInclude.Include.NON_NULL)
4141
@JsonPropertyOrder({
4242
"alias",
4343
"create",
44+
"password",
4445
"passwordSecretRef"
4546
})
4647
@ToString
@@ -72,6 +73,8 @@ public class JKSKeystore implements Editable<JKSKeystoreBuilder>, KubernetesReso
7273
private String alias;
7374
@JsonProperty("create")
7475
private Boolean create;
76+
@JsonProperty("password")
77+
private String password;
7578
@JsonProperty("passwordSecretRef")
7679
private SecretKeySelector passwordSecretRef;
7780
@JsonIgnore
@@ -83,10 +86,11 @@ public class JKSKeystore implements Editable<JKSKeystoreBuilder>, KubernetesReso
8386
public JKSKeystore() {
8487
}
8588

86-
public JKSKeystore(String alias, Boolean create, SecretKeySelector passwordSecretRef) {
89+
public JKSKeystore(String alias, Boolean create, String password, SecretKeySelector passwordSecretRef) {
8790
super();
8891
this.alias = alias;
8992
this.create = create;
93+
this.password = password;
9094
this.passwordSecretRef = passwordSecretRef;
9195
}
9296

@@ -107,31 +111,47 @@ public void setAlias(String alias) {
107111
}
108112

109113
/**
110-
* Create enables JKS keystore creation for the Certificate. If true, a file named `keystore.jks` will be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef`. The keystore file will be updated immediately. If the issuer provided a CA certificate, a file named `truststore.jks` will also be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` containing the issuing Certificate Authority
114+
* Create enables JKS keystore creation for the Certificate. If true, a file named `keystore.jks` will be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` or `password`. The keystore file will be updated immediately. If the issuer provided a CA certificate, a file named `truststore.jks` will also be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` containing the issuing Certificate Authority
111115
*/
112116
@JsonProperty("create")
113117
public Boolean getCreate() {
114118
return create;
115119
}
116120

117121
/**
118-
* Create enables JKS keystore creation for the Certificate. If true, a file named `keystore.jks` will be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef`. The keystore file will be updated immediately. If the issuer provided a CA certificate, a file named `truststore.jks` will also be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` containing the issuing Certificate Authority
122+
* Create enables JKS keystore creation for the Certificate. If true, a file named `keystore.jks` will be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` or `password`. The keystore file will be updated immediately. If the issuer provided a CA certificate, a file named `truststore.jks` will also be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` containing the issuing Certificate Authority
119123
*/
120124
@JsonProperty("create")
121125
public void setCreate(Boolean create) {
122126
this.create = create;
123127
}
124128

125129
/**
126-
* JKS configures options for storing a JKS keystore in the `spec.secretName` Secret resource.
130+
* Password provides a literal password used to encrypt the JKS keystore. Mutually exclusive with passwordSecretRef. One of password or passwordSecretRef must provide a password with a non-zero length.
131+
*/
132+
@JsonProperty("password")
133+
public String getPassword() {
134+
return password;
135+
}
136+
137+
/**
138+
* Password provides a literal password used to encrypt the JKS keystore. Mutually exclusive with passwordSecretRef. One of password or passwordSecretRef must provide a password with a non-zero length.
139+
*/
140+
@JsonProperty("password")
141+
public void setPassword(String password) {
142+
this.password = password;
143+
}
144+
145+
/**
146+
* JKS configures options for storing a JKS keystore in the target secret. Either PasswordSecretRef or Password must be provided.
127147
*/
128148
@JsonProperty("passwordSecretRef")
129149
public SecretKeySelector getPasswordSecretRef() {
130150
return passwordSecretRef;
131151
}
132152

133153
/**
134-
* JKS configures options for storing a JKS keystore in the `spec.secretName` Secret resource.
154+
* JKS configures options for storing a JKS keystore in the target secret. Either PasswordSecretRef or Password must be provided.
135155
*/
136156
@JsonProperty("passwordSecretRef")
137157
public void setPasswordSecretRef(SecretKeySelector passwordSecretRef) {

‎extensions/certmanager/model/src/generated/java/io/fabric8/certmanager/api/model/v1/PKCS12Keystore.java

+23-3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
@JsonInclude(JsonInclude.Include.NON_NULL)
4141
@JsonPropertyOrder({
4242
"create",
43+
"password",
4344
"passwordSecretRef",
4445
"profile"
4546
})
@@ -70,6 +71,8 @@ public class PKCS12Keystore implements Editable<PKCS12KeystoreBuilder>, Kubernet
7071

7172
@JsonProperty("create")
7273
private Boolean create;
74+
@JsonProperty("password")
75+
private String password;
7376
@JsonProperty("passwordSecretRef")
7477
private SecretKeySelector passwordSecretRef;
7578
@JsonProperty("profile")
@@ -83,29 +86,46 @@ public class PKCS12Keystore implements Editable<PKCS12KeystoreBuilder>, Kubernet
8386
public PKCS12Keystore() {
8487
}
8588

86-
public PKCS12Keystore(Boolean create, SecretKeySelector passwordSecretRef, String profile) {
89+
public PKCS12Keystore(Boolean create, String password, SecretKeySelector passwordSecretRef, String profile) {
8790
super();
8891
this.create = create;
92+
this.password = password;
8993
this.passwordSecretRef = passwordSecretRef;
9094
this.profile = profile;
9195
}
9296

9397
/**
94-
* Create enables PKCS12 keystore creation for the Certificate. If true, a file named `keystore.p12` will be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef`. The keystore file will be updated immediately. If the issuer provided a CA certificate, a file named `truststore.p12` will also be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` containing the issuing Certificate Authority
98+
* Create enables PKCS12 keystore creation for the Certificate. If true, a file named `keystore.p12` will be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` or in `password`. The keystore file will be updated immediately. If the issuer provided a CA certificate, a file named `truststore.p12` will also be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` containing the issuing Certificate Authority
9599
*/
96100
@JsonProperty("create")
97101
public Boolean getCreate() {
98102
return create;
99103
}
100104

101105
/**
102-
* Create enables PKCS12 keystore creation for the Certificate. If true, a file named `keystore.p12` will be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef`. The keystore file will be updated immediately. If the issuer provided a CA certificate, a file named `truststore.p12` will also be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` containing the issuing Certificate Authority
106+
* Create enables PKCS12 keystore creation for the Certificate. If true, a file named `keystore.p12` will be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` or in `password`. The keystore file will be updated immediately. If the issuer provided a CA certificate, a file named `truststore.p12` will also be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` containing the issuing Certificate Authority
103107
*/
104108
@JsonProperty("create")
105109
public void setCreate(Boolean create) {
106110
this.create = create;
107111
}
108112

113+
/**
114+
* Password provides a literal password used to encrypt the PKCS#12 keystore. Mutually exclusive with passwordSecretRef. One of password or passwordSecretRef must provide a password with a non-zero length.
115+
*/
116+
@JsonProperty("password")
117+
public String getPassword() {
118+
return password;
119+
}
120+
121+
/**
122+
* Password provides a literal password used to encrypt the PKCS#12 keystore. Mutually exclusive with passwordSecretRef. One of password or passwordSecretRef must provide a password with a non-zero length.
123+
*/
124+
@JsonProperty("password")
125+
public void setPassword(String password) {
126+
this.password = password;
127+
}
128+
109129
/**
110130
* PKCS12 configures options for storing a PKCS12 keystore in the `spec.secretName` Secret resource.
111131
*/

‎kubernetes-model-generator/openapi/generator/go.mod

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.0
55
toolchain go1.23.1
66

77
require (
8-
github.com/cert-manager/cert-manager v1.16.3
8+
github.com/cert-manager/cert-manager v1.17.0
99
github.com/chaos-mesh/chaos-mesh/api v0.0.0
1010
github.com/getkin/kin-openapi v0.129.0
1111
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.5
@@ -110,7 +110,7 @@ require (
110110
github.com/agnivade/levenshtein v1.1.1 // indirect
111111
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
112112
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
113-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
113+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
114114
github.com/aws/aws-sdk-go v1.53.5 // indirect
115115
github.com/beorn7/perks v1.0.1 // indirect
116116
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -127,7 +127,7 @@ require (
127127
github.com/docker/go-units v0.5.0 // indirect
128128
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
129129
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
130-
github.com/fsnotify/fsnotify v1.7.0 // indirect
130+
github.com/fsnotify/fsnotify v1.8.0 // indirect
131131
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
132132
github.com/go-errors/errors v1.4.2 // indirect
133133
github.com/go-kit/log v0.2.1 // indirect
@@ -163,8 +163,8 @@ require (
163163
github.com/json-iterator/go v1.1.12 // indirect
164164
github.com/kdomanski/iso9660 v0.2.1 // indirect
165165
github.com/kelseyhightower/envconfig v1.4.0 // indirect
166-
github.com/klauspost/compress v1.17.9 // indirect
167-
github.com/mailru/easyjson v0.7.7 // indirect
166+
github.com/klauspost/compress v1.17.11 // indirect
167+
github.com/mailru/easyjson v0.9.0 // indirect
168168
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
169169
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
170170
github.com/metal3-io/ip-address-manager/api v1.9.2 // indirect
@@ -182,9 +182,9 @@ require (
182182
github.com/perimeterx/marshmallow v1.1.5 // indirect
183183
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
184184
github.com/pkg/errors v0.9.1 // indirect
185-
github.com/prometheus/client_golang v1.20.4 // indirect
185+
github.com/prometheus/client_golang v1.20.5 // indirect
186186
github.com/prometheus/client_model v0.6.1 // indirect
187-
github.com/prometheus/common v0.59.1 // indirect
187+
github.com/prometheus/common v0.61.0 // indirect
188188
github.com/prometheus/procfs v0.15.1 // indirect
189189
github.com/prometheus/statsd_exporter v0.22.7 // indirect
190190
github.com/rickb777/date v1.14.1 // indirect
@@ -200,7 +200,7 @@ require (
200200
go.uber.org/multierr v1.11.0 // indirect
201201
go.uber.org/zap v1.27.0 // indirect
202202
golang.org/x/crypto v0.32.0 // indirect
203-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
203+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
204204
golang.org/x/mod v0.22.0 // indirect
205205
golang.org/x/net v0.34.0 // indirect
206206
golang.org/x/oauth2 v0.25.0 // indirect

0 commit comments

Comments
 (0)