From 2d44a9d100697f2a5c5379c1effe5bf88b92bd35 Mon Sep 17 00:00:00 2001
From: Siegfried Weber <mail@siegfriedweber.net>
Date: Tue, 11 Jun 2024 11:21:54 +0200
Subject: [PATCH] Update the krb5 image in the integration tests (#537)

* Update the krb5 image in the integration tests

* Rename the test dimension krb5-latest to krb5
---
 .../templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2  | 8 ++++----
 .../kuttl/topology-provider/01-install-krb5-kdc.yaml.j2   | 8 ++++----
 tests/test-definition.yaml                                | 5 +++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2 b/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2
index 52a12f4f..88357f39 100644
--- a/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2
+++ b/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: test-sa
       initContainers:
         - name: init
-          image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev
+          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - sh
             - -euo
@@ -36,7 +36,7 @@ spec:
               name: data
       containers:
         - name: kdc
-          image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev
+          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - krb5kdc
             - -n
@@ -54,7 +54,7 @@ spec:
             runAsUser: 0
 {% endif %}
         - name: kadmind
-          image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev
+          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - kadmind
             - -nofork
@@ -72,7 +72,7 @@ spec:
             runAsUser: 0
 {% endif %}
         - name: client
-          image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev
+          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           tty: true
           stdin: true
           env:
diff --git a/tests/templates/kuttl/topology-provider/01-install-krb5-kdc.yaml.j2 b/tests/templates/kuttl/topology-provider/01-install-krb5-kdc.yaml.j2
index e08e5731..6f9ed90c 100644
--- a/tests/templates/kuttl/topology-provider/01-install-krb5-kdc.yaml.j2
+++ b/tests/templates/kuttl/topology-provider/01-install-krb5-kdc.yaml.j2
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: test-sa
       initContainers:
         - name: init
-          image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev
+          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - sh
             - -euo
@@ -36,7 +36,7 @@ spec:
               name: data
       containers:
         - name: kdc
-          image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev
+          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - krb5kdc
             - -n
@@ -54,7 +54,7 @@ spec:
             runAsUser: 0
 {% endif %}
         - name: kadmind
-          image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev
+          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - kadmind
             - -nofork
@@ -67,7 +67,7 @@ spec:
             - mountPath: /var/kerberos/krb5kdc
               name: data
         - name: client
-          image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev
+          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           tty: true
           stdin: true
           env:
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index d99b5115..ca4771ea 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -16,6 +16,9 @@ dimensions:
   - name: zookeeper-latest
     values:
       - 3.9.1
+  - name: krb5
+    values:
+      - 1.21.1
   - name: number-of-datanodes
     values:
       - "1"
@@ -56,6 +59,7 @@ tests:
     dimensions:
       - hadoop-latest # We only support Kerberos for HDFS >= 3.3.x. See rust/operator/src/kerberos.rs for details
       - zookeeper-latest
+      - krb5
       - kerberos-realm
       - kerberos-backend
       - openshift
@@ -63,6 +67,7 @@ tests:
     dimensions:
       - hadoop-latest
       - zookeeper-latest
+      - krb5
       - kerberos-backend
       - openshift
   - name: orphaned-resources