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.

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

chore(deps): bump github.com/cert-manager/cert-manager from 1.16.3 to 1.17.0 in /kubernetes-model-generator/openapi/generator #6855

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
"clientID",
"resourceID"
"resourceID",
"tenantID"
})
@ToString
@EqualsAndHashCode
Expand Down Expand Up @@ -70,6 +71,8 @@ public class AzureManagedIdentity implements Editable<AzureManagedIdentityBuilde
private String clientID;
@JsonProperty("resourceID")
private String resourceID;
@JsonProperty("tenantID")
private String tenantID;
@JsonIgnore
private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();

Expand All @@ -79,10 +82,11 @@ public class AzureManagedIdentity implements Editable<AzureManagedIdentityBuilde
public AzureManagedIdentity() {
}

public AzureManagedIdentity(String clientID, String resourceID) {
public AzureManagedIdentity(String clientID, String resourceID, String tenantID) {
super();
this.clientID = clientID;
this.resourceID = resourceID;
this.tenantID = tenantID;
}

/**
Expand Down Expand Up @@ -117,6 +121,22 @@ public void setResourceID(String resourceID) {
this.resourceID = resourceID;
}

/**
* tenant ID of the managed identity, can not be used at the same time as resourceID
*/
@JsonProperty("tenantID")
public String getTenantID() {
return tenantID;
}

/**
* tenant ID of the managed identity, can not be used at the same time as resourceID
*/
@JsonProperty("tenantID")
public void setTenantID(String tenantID) {
this.tenantID = tenantID;
}

@JsonIgnore
public AzureManagedIdentityBuilder edit() {
return new AzureManagedIdentityBuilder(this);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@
import lombok.experimental.Accessors;

/**
* JKS configures options for storing a JKS keystore in the `spec.secretName` Secret resource.
* JKS configures options for storing a JKS keystore in the target secret. Either PasswordSecretRef or Password must be provided.
*/
@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
"alias",
"create",
"password",
"passwordSecretRef"
})
@ToString
Expand Down Expand Up @@ -72,6 +73,8 @@ public class JKSKeystore implements Editable<JKSKeystoreBuilder>, KubernetesReso
private String alias;
@JsonProperty("create")
private Boolean create;
@JsonProperty("password")
private String password;
@JsonProperty("passwordSecretRef")
private SecretKeySelector passwordSecretRef;
@JsonIgnore
Expand All @@ -83,10 +86,11 @@ public class JKSKeystore implements Editable<JKSKeystoreBuilder>, KubernetesReso
public JKSKeystore() {
}

public JKSKeystore(String alias, Boolean create, SecretKeySelector passwordSecretRef) {
public JKSKeystore(String alias, Boolean create, String password, SecretKeySelector passwordSecretRef) {
super();
this.alias = alias;
this.create = create;
this.password = password;
this.passwordSecretRef = passwordSecretRef;
}

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

/**
* 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
* 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
*/
@JsonProperty("create")
public Boolean getCreate() {
return create;
}

/**
* 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
* 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
*/
@JsonProperty("create")
public void setCreate(Boolean create) {
this.create = create;
}

/**
* JKS configures options for storing a JKS keystore in the `spec.secretName` Secret resource.
* 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.
*/
@JsonProperty("password")
public String getPassword() {
return password;
}

/**
* 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.
*/
@JsonProperty("password")
public void setPassword(String password) {
this.password = password;
}

/**
* JKS configures options for storing a JKS keystore in the target secret. Either PasswordSecretRef or Password must be provided.
*/
@JsonProperty("passwordSecretRef")
public SecretKeySelector getPasswordSecretRef() {
return passwordSecretRef;
}

/**
* JKS configures options for storing a JKS keystore in the `spec.secretName` Secret resource.
* JKS configures options for storing a JKS keystore in the target secret. Either PasswordSecretRef or Password must be provided.
*/
@JsonProperty("passwordSecretRef")
public void setPasswordSecretRef(SecretKeySelector passwordSecretRef) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
"create",
"password",
"passwordSecretRef",
"profile"
})
Expand Down Expand Up @@ -70,6 +71,8 @@ public class PKCS12Keystore implements Editable<PKCS12KeystoreBuilder>, Kubernet

@JsonProperty("create")
private Boolean create;
@JsonProperty("password")
private String password;
@JsonProperty("passwordSecretRef")
private SecretKeySelector passwordSecretRef;
@JsonProperty("profile")
Expand All @@ -83,29 +86,46 @@ public class PKCS12Keystore implements Editable<PKCS12KeystoreBuilder>, Kubernet
public PKCS12Keystore() {
}

public PKCS12Keystore(Boolean create, SecretKeySelector passwordSecretRef, String profile) {
public PKCS12Keystore(Boolean create, String password, SecretKeySelector passwordSecretRef, String profile) {
super();
this.create = create;
this.password = password;
this.passwordSecretRef = passwordSecretRef;
this.profile = profile;
}

/**
* 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
* 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
*/
@JsonProperty("create")
public Boolean getCreate() {
return create;
}

/**
* 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
* 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
*/
@JsonProperty("create")
public void setCreate(Boolean create) {
this.create = create;
}

/**
* 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.
*/
@JsonProperty("password")
public String getPassword() {
return password;
}

/**
* 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.
*/
@JsonProperty("password")
public void setPassword(String password) {
this.password = password;
}

/**
* PKCS12 configures options for storing a PKCS12 keystore in the `spec.secretName` Secret resource.
*/
Expand Down
16 changes: 8 additions & 8 deletions kubernetes-model-generator/openapi/generator/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.23.0
toolchain go1.23.1

require (
github.com/cert-manager/cert-manager v1.16.3
github.com/cert-manager/cert-manager v1.17.0
github.com/chaos-mesh/chaos-mesh/api v0.0.0
github.com/getkin/kin-openapi v0.129.0
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.5
Expand Down Expand Up @@ -110,7 +110,7 @@ require (
github.com/agnivade/levenshtein v1.1.1 // indirect
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/aws/aws-sdk-go v1.53.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
Expand All @@ -127,7 +127,7 @@ require (
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-kit/log v0.2.1 // indirect
Expand Down Expand Up @@ -163,8 +163,8 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/kdomanski/iso9660 v0.2.1 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/mailru/easyjson v0.9.0 // indirect
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
github.com/metal3-io/ip-address-manager/api v1.9.2 // indirect
Expand All @@ -182,9 +182,9 @@ require (
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.20.4 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.59.1 // indirect
github.com/prometheus/common v0.61.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
github.com/rickb777/date v1.14.1 // indirect
Expand All @@ -200,7 +200,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.25.0 // indirect
Expand Down
Loading
Loading