Remove the external base-deployment.yaml file (#12437)

Resolves #12436
This commit is contained in:
Andrea Peruffo 2022-06-09 17:45:25 +01:00 committed by GitHub
parent fa22f1bdc7
commit e955a7c9c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 42 deletions

View file

@ -22,6 +22,7 @@ import io.fabric8.kubernetes.api.model.EnvVarBuilder;
import io.fabric8.kubernetes.api.model.EnvVarSourceBuilder; import io.fabric8.kubernetes.api.model.EnvVarSourceBuilder;
import io.fabric8.kubernetes.api.model.ExecActionBuilder; import io.fabric8.kubernetes.api.model.ExecActionBuilder;
import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.PodTemplateSpec;
import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.ResourceRequirements;
import io.fabric8.kubernetes.api.model.VolumeBuilder; import io.fabric8.kubernetes.api.model.VolumeBuilder;
@ -29,7 +30,6 @@ import io.fabric8.kubernetes.api.model.VolumeMountBuilder;
import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder; import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.utils.Serialization;
import io.quarkus.logging.Log; import io.quarkus.logging.Log;
import org.keycloak.operator.Config; import org.keycloak.operator.Config;
import org.keycloak.operator.Constants; import org.keycloak.operator.Constants;
@ -463,8 +463,53 @@ public class KeycloakDeployment extends OperatorManagedResource implements Statu
} }
private Deployment createBaseDeployment() { private Deployment createBaseDeployment() {
var is = this.getClass().getResourceAsStream("/base-keycloak-deployment.yaml"); Deployment baseDeployment = new DeploymentBuilder()
Deployment baseDeployment = Serialization.unmarshal(is, Deployment.class); .withNewMetadata()
.endMetadata()
.withNewSpec()
.withNewSelector()
.addToMatchLabels("app", "")
.endSelector()
.withNewTemplate()
.withNewMetadata()
.addToLabels("app", "")
.endMetadata()
.withNewSpec()
.withRestartPolicy("Always")
.withTerminationGracePeriodSeconds(30L)
.withDnsPolicy("ClusterFirst")
.addNewContainer()
.withName("keycloak")
.withArgs("start")
.addNewPort()
.withContainerPort(8443)
.withProtocol("TCP")
.endPort()
.addNewPort()
.withContainerPort(8080)
.withProtocol("TCP")
.endPort()
.withNewReadinessProbe()
.withInitialDelaySeconds(20)
.withPeriodSeconds(2)
.withFailureThreshold(250)
.endReadinessProbe()
.withNewLivenessProbe()
.withInitialDelaySeconds(20)
.withPeriodSeconds(2)
.withFailureThreshold(150)
.endLivenessProbe()
.endContainer()
.endSpec()
.endTemplate()
.withNewStrategy()
.withNewRollingUpdate()
.withMaxSurge(new IntOrString("25%"))
.withMaxUnavailable(new IntOrString("25%"))
.endRollingUpdate()
.endStrategy()
.endSpec()
.build();
baseDeployment.getMetadata().setName(getName()); baseDeployment.getMetadata().setName(getName());
baseDeployment.getMetadata().setNamespace(getNamespace()); baseDeployment.getMetadata().setNamespace(getNamespace());

View file

@ -1,39 +0,0 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: ""
spec:
selector:
matchLabels:
app: ""
strategy:
rollingUpdate:
maxSurge: 25%
maxUnavailable: 25%
type: RollingUpdate
template:
metadata:
labels:
app: ""
spec:
containers:
- args:
- start
imagePullPolicy: Always
name: keycloak
ports:
- containerPort: 8443
protocol: TCP
- containerPort: 8080
protocol: TCP
livenessProbe:
initialDelaySeconds: 20
periodSeconds: 2
failureThreshold: 150
readinessProbe:
initialDelaySeconds: 20
periodSeconds: 2
failureThreshold: 250
dnsPolicy: ClusterFirst
restartPolicy: Always
terminationGracePeriodSeconds: 30