From c3efbf0d204efbe1a520ac7bd80e1fc46f44bbc5 Mon Sep 17 00:00:00 2001 From: xeniape Date: Tue, 4 Feb 2025 08:53:46 +0100 Subject: [PATCH 1/2] chore: update to oci references --- Dockerfile | 2 +- test/stack/01-install-krb5-kdc.yaml | 8 ++++---- test/stack/30-test-hdfs-permissions.yaml | 2 +- test/stack/31-benchmark-shell.yaml | 2 +- test/topology-provider/stack/01-install-krb5-kdc.yaml | 8 ++++---- test/topology-provider/teragen/Dockerfile | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index f63366e..59b7f1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.stackable.tech/stackable/hadoop:3.4.0-stackable0.0.0-dev +FROM oci.stackable.tech/sdp/hadoop:3.4.0-stackable0.0.0-dev # Remove existing hdfs-utils jars, so we can ship our custom one RUN rm -f /stackable/hadoop/share/hadoop/common/lib/hdfs-utils-*.jar diff --git a/test/stack/01-install-krb5-kdc.yaml b/test/stack/01-install-krb5-kdc.yaml index 49f5ec8..d1447cf 100644 --- a/test/stack/01-install-krb5-kdc.yaml +++ b/test/stack/01-install-krb5-kdc.yaml @@ -31,7 +31,7 @@ spec: spec: initContainers: - name: init - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev args: - sh - -euo @@ -52,7 +52,7 @@ spec: name: data containers: - name: kdc - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev args: - krb5kdc - -n @@ -65,7 +65,7 @@ spec: - mountPath: /var/kerberos/krb5kdc name: data - name: kadmind - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev args: - kadmind - -nofork @@ -78,7 +78,7 @@ spec: - mountPath: /var/kerberos/krb5kdc name: data - name: client - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev tty: true stdin: true env: diff --git a/test/stack/30-test-hdfs-permissions.yaml b/test/stack/30-test-hdfs-permissions.yaml index a72cbe1..2948f35 100644 --- a/test/stack/30-test-hdfs-permissions.yaml +++ b/test/stack/30-test-hdfs-permissions.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: test-hdfs-permissions - image: docker.stackable.tech/stackable/hadoop:3.4.0-stackable0.0.0-dev + image: oci.stackable.tech/sdp/hadoop:3.4.0-stackable0.0.0-dev env: - name: HADOOP_CONF_DIR value: /stackable/conf/hdfs diff --git a/test/stack/31-benchmark-shell.yaml b/test/stack/31-benchmark-shell.yaml index 3af110d..8a8ae94 100644 --- a/test/stack/31-benchmark-shell.yaml +++ b/test/stack/31-benchmark-shell.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: benchmark-shell - image: docker.stackable.tech/stackable/hadoop:3.4.0-stackable0.0.0-dev + image: oci.stackable.tech/sdp/hadoop:3.4.0-stackable0.0.0-dev env: - name: HADOOP_CONF_DIR value: /stackable/conf/hdfs diff --git a/test/topology-provider/stack/01-install-krb5-kdc.yaml b/test/topology-provider/stack/01-install-krb5-kdc.yaml index 49f5ec8..d1447cf 100644 --- a/test/topology-provider/stack/01-install-krb5-kdc.yaml +++ b/test/topology-provider/stack/01-install-krb5-kdc.yaml @@ -31,7 +31,7 @@ spec: spec: initContainers: - name: init - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev args: - sh - -euo @@ -52,7 +52,7 @@ spec: name: data containers: - name: kdc - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev args: - krb5kdc - -n @@ -65,7 +65,7 @@ spec: - mountPath: /var/kerberos/krb5kdc name: data - name: kadmind - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev args: - kadmind - -nofork @@ -78,7 +78,7 @@ spec: - mountPath: /var/kerberos/krb5kdc name: data - name: client - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev tty: true stdin: true env: diff --git a/test/topology-provider/teragen/Dockerfile b/test/topology-provider/teragen/Dockerfile index e176b70..ee44bae 100644 --- a/test/topology-provider/teragen/Dockerfile +++ b/test/topology-provider/teragen/Dockerfile @@ -3,7 +3,7 @@ # docker build . -t docker.stackable.tech/stackable/spark-k8s-with-teragen:3.5.0-stackable0.0.0-dev # -FROM docker.stackable.tech/stackable/spark-k8s:3.5.1-stackable0.0.0-dev +FROM oci.stackable.tech/sdp/spark-k8s:3.5.1-stackable0.0.0-dev # this .jar is compiled from the code here: https://github.com/ehiggs/spark-terasort COPY --chown=stackable:stackable ./spark-terasort-1.2-SNAPSHOT.jar /tmp/ \ No newline at end of file From 5cb024ec42832bb8d6c2961221c7c1ca46b48aca Mon Sep 17 00:00:00 2001 From: xeniape Date: Tue, 4 Feb 2025 08:57:10 +0100 Subject: [PATCH 2/2] add changelog entry --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f806239..0dce62c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Changed + +- Update registry references to oci ([#53]). + +[#53]: https://github.com/stackabletech/hdfs-utils/pull/53 + ## [0.4.0] - 2024-11-05 ### Changed