libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Operator doesn't reconcile annotations specified in pod template

Browse source
This commit is contained in:
Václav Muzikář 2022-07-19 12:24:09 +02:00 committed by Bruno Oliveira da Silva
parent 1b9a3bf51a
commit 15a04021e0
2 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
operator/src/main/java/org/keycloak/operator/controllers/KeycloakDeployment.java
View file

@ -93,11 +93,12 @@ public class KeycloakDeployment extends OperatorManagedResource implements Statu
// don't overwrite metadata, just specs
reconciledDeployment.setSpec(baseDeployment.getSpec());
// don't overwrite annotations in pod templates to support rolling restarts
// don't fully overwrite annotations in pod templates to support rolling restarts (K8s sets some extra annotation to track restart)
// instead, merge it
if (existingDeployment.getSpec() != null && existingDeployment.getSpec().getTemplate() != null) {
mergeMaps(
Optional.ofNullable(reconciledDeployment.getSpec().getTemplate().getMetadata()).map(m -> m.getAnnotations()).orElse(null),
Optional.ofNullable(existingDeployment.getSpec().getTemplate().getMetadata()).map(m -> m.getAnnotations()).orElse(null),
Optional.ofNullable(reconciledDeployment.getSpec().getTemplate().getMetadata()).map(m -> m.getAnnotations()).orElse(null),
annotations -> reconciledDeployment.getSpec().getTemplate().getMetadata().setAnnotations(annotations));
}
}

37
operator/src/test/java/org/keycloak/operator/testsuite/unit/PodTemplateTest.java
View file

@ -22,6 +22,7 @@ import io.fabric8.kubernetes.api.model.PodTemplateSpec;
import io.fabric8.kubernetes.api.model.PodTemplateSpecBuilder;
import io.fabric8.kubernetes.api.model.ProbeBuilder;
import io.fabric8.kubernetes.api.model.apps.StatefulSet;
import io.fabric8.kubernetes.api.model.apps.StatefulSetBuilder;
import io.quarkus.test.junit.QuarkusTest;
import org.junit.jupiter.api.Test;
import org.keycloak.operator.Config;
@ -30,13 +31,14 @@ import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak;
import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpec;
import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpecUnsupported;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@QuarkusTest
public class PodTemplateTest {
StatefulSet getDeployment(PodTemplateSpec podTemplate) {
private StatefulSet getDeployment(PodTemplateSpec podTemplate, StatefulSet existingDeployment) {
var config = new Config(){
@Override
public Keycloak keycloak() {
@ -58,10 +60,14 @@ public class PodTemplateTest {
spec.setHostname("example.com");
spec.setTlsSecret("example-tls-secret");
kc.setSpec(spec);
var deployment = new KeycloakDeployment(null, config, kc, new StatefulSet(), "dummy-admin");
var deployment = new KeycloakDeployment(null, config, kc, existingDeployment, "dummy-admin");
return (StatefulSet) deployment.getReconciledResource().get();
}
private StatefulSet getDeployment(PodTemplateSpec podTemplate) {
return getDeployment(podTemplate, new StatefulSet());
}
@Test
public void testEmpty() {
// Arrange
@ -235,4 +241,31 @@ public class PodTemplateTest {
assertEquals(env, envVar.getName());
assertEquals(value, envVar.getValue());
}
@Test
public void testAnnotationsAreMerged() {
// Arrange
var existingDeployment = new StatefulSetBuilder()
.withNewSpec()
.withNewTemplate()
.withNewMetadata()
.addToAnnotations("one", "1")
.addToAnnotations("two", "3")
.endMetadata()
.endTemplate()
.endSpec()
.build();
var additionalPodTemplate = new PodTemplateSpecBuilder()
.withNewMetadata()
.addToAnnotations("two", "2")
.endMetadata()
.build();
// Act
var podTemplate = getDeployment(additionalPodTemplate, existingDeployment).getSpec().getTemplate();
// Assert
assertThat(podTemplate.getMetadata().getAnnotations()).containsEntry("one", "1");
assertThat(podTemplate.getMetadata().getAnnotations()).containsEntry("two", "2");
}
}