From 310de73d90170694ec76f6007a8f5050865a04a9 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Tue, 6 Feb 2024 08:31:35 +0100 Subject: [PATCH] Revert using images from the sandbox repository --- tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2 | 1 - tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2 | 1 - tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2 | 1 - tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2 | 1 - tests/templates/kuttl/external-access/30-install-hdfs.yaml.j2 | 1 - tests/templates/kuttl/kerberos/11-install-hdfs.yaml.j2 | 1 - tests/templates/kuttl/kerberos/20-access-hdfs.yaml.j2 | 2 +- tests/templates/kuttl/kerberos/22-check-file.yaml.j2 | 2 +- .../kuttl/logging/03-install-hdfs-automatic-log.yaml.j2 | 1 - .../templates/kuttl/logging/04-install-hdfs-custom-log.yaml.j2 | 1 - .../templates/kuttl/orphaned-resources/02-install-hdfs.yaml.j2 | 1 - .../kuttl/orphaned-resources/03-remove-datanode.yaml.j2 | 1 - .../orphaned-resources/04-change-datanode-rolegroup.yaml.j2 | 1 - tests/templates/kuttl/profiling/02-install-hdfs.yaml.j2 | 1 - tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2 | 1 - 15 files changed, 2 insertions(+), 15 deletions(-) diff --git a/tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2 index 20eadedc..0a05e2ff 100644 --- a/tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2 @@ -10,7 +10,6 @@ metadata: spec: image: productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent clusterConfig: dfsReplication: 1 diff --git a/tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2 index 11d4e432..67b97daf 100644 --- a/tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2 @@ -10,7 +10,6 @@ metadata: spec: image: productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent clusterConfig: dfsReplication: 1 diff --git a/tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2 index a8bd64fd..0f3ee571 100644 --- a/tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2 @@ -10,7 +10,6 @@ metadata: spec: image: productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent clusterConfig: dfsReplication: 1 diff --git a/tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2 b/tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2 index 20eadedc..0a05e2ff 100644 --- a/tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2 @@ -10,7 +10,6 @@ metadata: spec: image: productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent clusterConfig: dfsReplication: 1 diff --git a/tests/templates/kuttl/external-access/30-install-hdfs.yaml.j2 b/tests/templates/kuttl/external-access/30-install-hdfs.yaml.j2 index 9f2caf37..c1af5f95 100644 --- a/tests/templates/kuttl/external-access/30-install-hdfs.yaml.j2 +++ b/tests/templates/kuttl/external-access/30-install-hdfs.yaml.j2 @@ -12,7 +12,6 @@ metadata: spec: image: productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent clusterConfig: zookeeperConfigMapName: hdfs-zk diff --git a/tests/templates/kuttl/kerberos/11-install-hdfs.yaml.j2 b/tests/templates/kuttl/kerberos/11-install-hdfs.yaml.j2 index 462a0f22..24bfad15 100644 --- a/tests/templates/kuttl/kerberos/11-install-hdfs.yaml.j2 +++ b/tests/templates/kuttl/kerberos/11-install-hdfs.yaml.j2 @@ -12,7 +12,6 @@ commands: spec: image: productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent clusterConfig: zookeeperConfigMapName: hdfs-zk diff --git a/tests/templates/kuttl/kerberos/20-access-hdfs.yaml.j2 b/tests/templates/kuttl/kerberos/20-access-hdfs.yaml.j2 index 4336c498..cb3342ab 100644 --- a/tests/templates/kuttl/kerberos/20-access-hdfs.yaml.j2 +++ b/tests/templates/kuttl/kerberos/20-access-hdfs.yaml.j2 @@ -14,7 +14,7 @@ commands: spec: containers: - name: access-hdfs - image: docker.stackable.tech/sandbox/docker-images-pr540-5212814/hadoop:{{ test_scenario['values']['hadoop-latest'] }}-stackable0.0.0-dev + image: docker.stackable.tech/stackable/hadoop:{{ test_scenario['values']['hadoop-latest'] }}-stackable0.0.0-dev env: - name: HADOOP_CONF_DIR value: /stackable/conf/hdfs diff --git a/tests/templates/kuttl/kerberos/22-check-file.yaml.j2 b/tests/templates/kuttl/kerberos/22-check-file.yaml.j2 index cd993906..ba48a585 100644 --- a/tests/templates/kuttl/kerberos/22-check-file.yaml.j2 +++ b/tests/templates/kuttl/kerberos/22-check-file.yaml.j2 @@ -14,7 +14,7 @@ commands: spec: containers: - name: check-hdfs - image: docker.stackable.tech/sandbox/docker-images-pr540-5212814/hadoop:{{ test_scenario['values']['hadoop-latest'] }}-stackable0.0.0-dev + image: docker.stackable.tech/stackable/hadoop:{{ test_scenario['values']['hadoop-latest'] }}-stackable0.0.0-dev env: - name: HADOOP_CONF_DIR value: /stackable/conf/hdfs diff --git a/tests/templates/kuttl/logging/03-install-hdfs-automatic-log.yaml.j2 b/tests/templates/kuttl/logging/03-install-hdfs-automatic-log.yaml.j2 index a323f85e..0d88aaf9 100644 --- a/tests/templates/kuttl/logging/03-install-hdfs-automatic-log.yaml.j2 +++ b/tests/templates/kuttl/logging/03-install-hdfs-automatic-log.yaml.j2 @@ -6,7 +6,6 @@ metadata: spec: image: productVersion: "{{ test_scenario['values']['hadoop'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent clusterConfig: vectorAggregatorConfigMapName: hdfs-vector-aggregator-discovery diff --git a/tests/templates/kuttl/logging/04-install-hdfs-custom-log.yaml.j2 b/tests/templates/kuttl/logging/04-install-hdfs-custom-log.yaml.j2 index 41225d70..955febec 100644 --- a/tests/templates/kuttl/logging/04-install-hdfs-custom-log.yaml.j2 +++ b/tests/templates/kuttl/logging/04-install-hdfs-custom-log.yaml.j2 @@ -63,7 +63,6 @@ metadata: spec: image: productVersion: "{{ test_scenario['values']['hadoop'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent clusterConfig: vectorAggregatorConfigMapName: hdfs-vector-aggregator-discovery diff --git a/tests/templates/kuttl/orphaned-resources/02-install-hdfs.yaml.j2 b/tests/templates/kuttl/orphaned-resources/02-install-hdfs.yaml.j2 index e293803c..d5a411c4 100644 --- a/tests/templates/kuttl/orphaned-resources/02-install-hdfs.yaml.j2 +++ b/tests/templates/kuttl/orphaned-resources/02-install-hdfs.yaml.j2 @@ -6,7 +6,6 @@ metadata: spec: image: productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent clusterConfig: dfsReplication: 1 diff --git a/tests/templates/kuttl/orphaned-resources/03-remove-datanode.yaml.j2 b/tests/templates/kuttl/orphaned-resources/03-remove-datanode.yaml.j2 index 2f592d58..994bc944 100644 --- a/tests/templates/kuttl/orphaned-resources/03-remove-datanode.yaml.j2 +++ b/tests/templates/kuttl/orphaned-resources/03-remove-datanode.yaml.j2 @@ -6,7 +6,6 @@ metadata: spec: image: productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent clusterConfig: dfsReplication: 1 diff --git a/tests/templates/kuttl/orphaned-resources/04-change-datanode-rolegroup.yaml.j2 b/tests/templates/kuttl/orphaned-resources/04-change-datanode-rolegroup.yaml.j2 index 13e8c7f2..6bcb9195 100644 --- a/tests/templates/kuttl/orphaned-resources/04-change-datanode-rolegroup.yaml.j2 +++ b/tests/templates/kuttl/orphaned-resources/04-change-datanode-rolegroup.yaml.j2 @@ -6,7 +6,6 @@ metadata: spec: image: productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent dataNodes: config: diff --git a/tests/templates/kuttl/profiling/02-install-hdfs.yaml.j2 b/tests/templates/kuttl/profiling/02-install-hdfs.yaml.j2 index e9b7d800..c266897c 100644 --- a/tests/templates/kuttl/profiling/02-install-hdfs.yaml.j2 +++ b/tests/templates/kuttl/profiling/02-install-hdfs.yaml.j2 @@ -6,7 +6,6 @@ metadata: spec: image: productVersion: "{{ test_scenario['values']['hadoop'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent clusterConfig: dfsReplication: 1 diff --git a/tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2 b/tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2 index b81df29c..8193761f 100644 --- a/tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2 +++ b/tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2 @@ -12,7 +12,6 @@ metadata: spec: image: productVersion: "{{ test_scenario['values']['hadoop'] }}" - repo: docker.stackable.tech/sandbox/docker-images-pr540-5212814 pullPolicy: IfNotPresent clusterConfig: zookeeperConfigMapName: hdfs-zk