diff --git a/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecConfiguration.java b/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecConfiguration.java index 2986ddcb..dd3204d2 100644 --- a/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecConfiguration.java +++ b/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecConfiguration.java @@ -42,6 +42,8 @@ public class ApicurioRegistrySpecConfiguration { private String logLevel; + private String registryLogLevel; + private ApicurioRegistrySpecConfigurationSecurity security; private List env; @@ -86,6 +88,14 @@ public void setLogLevel(String logLevel) { this.logLevel = logLevel; } + public String getRegistryLogLevel() { + return registryLogLevel; + } + + public void setRegistryLogLevel(String registryLogLevel) { + this.registryLogLevel = registryLogLevel; + } + public ApicurioRegistrySpecConfigurationSecurity getSecurity() { return security; } diff --git a/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecConfigurationSecurity.java b/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecConfigurationSecurity.java index c3f4adfe..53119d40 100644 --- a/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecConfigurationSecurity.java +++ b/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecConfigurationSecurity.java @@ -31,6 +31,8 @@ public class ApicurioRegistrySpecConfigurationSecurity { private ApicurioRegistrySpecConfigurationSecurityKeycloak keycloak; + private ApicurioRegistrySpecConfigurationSecurityHttps https; + public ApicurioRegistrySpecConfigurationSecurityKeycloak getKeycloak() { return keycloak; } @@ -38,4 +40,12 @@ public ApicurioRegistrySpecConfigurationSecurityKeycloak getKeycloak() { public void setKeycloak(ApicurioRegistrySpecConfigurationSecurityKeycloak keycloak) { this.keycloak = keycloak; } + + public ApicurioRegistrySpecConfigurationSecurityHttps getHttps() { + return https; + } + + public void setHttps(ApicurioRegistrySpecConfigurationSecurityHttps https) { + this.https = https; + } } diff --git a/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecConfigurationSecurityHttps.java b/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecConfigurationSecurityHttps.java new file mode 100644 index 00000000..59641876 --- /dev/null +++ b/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecConfigurationSecurityHttps.java @@ -0,0 +1,51 @@ +/* + * Copyright 2022 Red Hat + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.apicurio.registry.operator.api.v1.model; + +import io.sundr.builder.annotations.Buildable; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Buildable( + editableEnabled = false, + builderPackage = Constants.FABRIC8_KUBERNETES_API +) +@EqualsAndHashCode +@ToString +// NOTE: We can not use Lombok @Getter and @Setter because it does not work with fabric8 generator. +public class ApicurioRegistrySpecConfigurationSecurityHttps { + + private boolean disableHttp; + + private String secretName; + + public boolean isDisableHttp() { + return disableHttp; + } + + public void setDisableHttp(boolean disableHttp) { + this.disableHttp = disableHttp; + } + + public String getSecretName() { + return secretName; + } + + public void setSecretName(String secretName) { + this.secretName = secretName; + } +} diff --git a/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecDeployment.java b/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecDeployment.java index 5a41d4f0..e52c3c79 100644 --- a/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecDeployment.java +++ b/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecDeployment.java @@ -18,6 +18,7 @@ import io.fabric8.kubernetes.api.model.Affinity; import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.Toleration; import io.sundr.builder.annotations.Buildable; import lombok.EqualsAndHashCode; @@ -48,6 +49,10 @@ public class ApicurioRegistrySpecDeployment { private List imagePullSecrets; + private ApicurioRegistrySpecDeploymentManagedResources managedResources; + + private PodTemplateSpec podTemplateSpecPreview; + public Integer getReplicas() { return replicas; } @@ -103,4 +108,20 @@ public List getImagePullSecrets() { public void setImagePullSecrets(List imagePullSecrets) { this.imagePullSecrets = imagePullSecrets; } + + public ApicurioRegistrySpecDeploymentManagedResources getManagedResources() { + return managedResources; + } + + public void setManagedResources(ApicurioRegistrySpecDeploymentManagedResources managedResources) { + this.managedResources = managedResources; + } + + public PodTemplateSpec getPodTemplateSpecPreview() { + return podTemplateSpecPreview; + } + + public void setPodTemplateSpecPreview(PodTemplateSpec podTemplateSpecPreview) { + this.podTemplateSpecPreview = podTemplateSpecPreview; + } } diff --git a/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecDeploymentManagedResources.java b/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecDeploymentManagedResources.java new file mode 100644 index 00000000..c39a7ee0 --- /dev/null +++ b/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistrySpecDeploymentManagedResources.java @@ -0,0 +1,66 @@ +/* + * Copyright 2022 Red Hat + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.apicurio.registry.operator.api.v1.model; + +import io.fabric8.kubernetes.api.model.Affinity; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.Toleration; +import io.sundr.builder.annotations.Buildable; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.util.List; + +@Buildable( + editableEnabled = false, + builderPackage = Constants.FABRIC8_KUBERNETES_API +) +@EqualsAndHashCode +@ToString +// NOTE: We can not use Lombok @Getter and @Setter because it does not work with fabric8 generator. +public class ApicurioRegistrySpecDeploymentManagedResources { + + private boolean disableIngress; + + private boolean disableNetworkPolicy; + + private boolean disablePodDisruptionBudget; + + public boolean isDisableIngress() { + return disableIngress; + } + + public void setDisableIngress(boolean disableIngress) { + this.disableIngress = disableIngress; + } + + public boolean isDisableNetworkPolicy() { + return disableNetworkPolicy; + } + + public void setDisableNetworkPolicy(boolean disableNetworkPolicy) { + this.disableNetworkPolicy = disableNetworkPolicy; + } + + public boolean isDisablePodDisruptionBudget() { + return disablePodDisruptionBudget; + } + + public void setDisablePodDisruptionBudget(boolean disablePodDisruptionBudget) { + this.disablePodDisruptionBudget = disablePodDisruptionBudget; + } +} diff --git a/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistryStatus.java b/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistryStatus.java index 571d9a4a..09be13b2 100644 --- a/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistryStatus.java +++ b/api-model/src/main/java/io/apicurio/registry/operator/api/v1/model/ApicurioRegistryStatus.java @@ -32,11 +32,19 @@ // NOTE: We can not use Lombok @Getter and @Setter because it does not work with fabric8 generator. public class ApicurioRegistryStatus { + private ApicurioRegistryStatusInfo info; + private List conditions; private List managedResources; - private ApicurioRegistryStatusInfo info; + public ApicurioRegistryStatusInfo getInfo() { + return info; + } + + public void setInfo(ApicurioRegistryStatusInfo info) { + this.info = info; + } public List getConditions() { return conditions; @@ -53,12 +61,4 @@ public List getManagedResources() { public void setManagedResources(List managedResources) { this.managedResources = managedResources; } - - public ApicurioRegistryStatusInfo getInfo() { - return info; - } - - public void setInfo(ApicurioRegistryStatusInfo info) { - this.info = info; - } }