(ozone-docker-testkrb5) branch master updated: HDDS-11820. Remove hard-coded principals from ozone-testkrb5 (#10)

[ad...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone-docker-testkrb5.git


The following commit(s) were added to refs/heads/master by this push:
     new 38a28fe  HDDS-11820. Remove hard-coded principals from ozone-testkrb5 (#10)
38a28fe is described below

commit 38a28fe3f569b533d2c477e257254544e24540bb
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Fri Nov 29 05:45:40 2024 +0100

    HDDS-11820. Remove hard-coded principals from ozone-testkrb5 (#10)
---
 Dockerfile |  4 +---
 init.sh    | 73 --------------------------------------------------------------
 2 files changed, 1 insertion(+), 76 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 48c9d6c..899df94 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,5 @@ RUN apk add --no-cache bash ca-certificates openssl krb5-server krb5 wget && upd
 WORKDIR /opt
 COPY krb5.conf /etc/
 COPY kadm5.acl /var/lib/krb5kdc/kadm5.acl
-COPY init.sh .
-RUN chmod +x ./init.sh && ./init.sh
+RUN kdb5_util create -s -P Welcome1 && kadmin.local -q "addprinc -randkey admin/admin@EXAMPLE.COM"
 ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
-
diff --git a/init.sh b/init.sh
deleted file mode 100644
index fafeeed..0000000
--- a/init.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-set -e
-
-kdb5_util create -s -P Welcome1
-
-kadmin.local -q "addprinc -randkey admin/admin@EXAMPLE.COM"
-
-kadmin.local -q "addprinc -randkey scm/scm@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey HTTP/scm@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey testuser/scm@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey testuser2/scm@EXAMPLE.COM"
-
-kadmin.local -q "addprinc -randkey recon/recon@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey HTTP/recon@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey testuser/recon@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey testuser2/recon@EXAMPLE.COM"
-
-kadmin.local -q "addprinc -randkey s3g/s3g@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey HTTP/s3g@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey testuser/s3g@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey testuser2/s3g@EXAMPLE.COM"
-
-#for HttpFS
-kadmin.local -q "addprinc -randkey httpfs/httpfs@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey HTTP/httpfs@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey testuser/httpfs@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey testuser2/httpfs@EXAMPLE.COM"
-
-kadmin.local -q "addprinc -randkey om/om@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey HTTP/om@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey testuser/om@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey testuser2/om@EXAMPLE.COM"
-
-kadmin.local -q "addprinc -randkey dn/dn@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey HTTP/dn@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey testuser/dn@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey testuser2/dn@EXAMPLE.COM"
-
-#for KMS
-kadmin.local -q "addprinc -randkey HTTP/kms@EXAMPLE.COM"
-
-#for Mapreduce tests (Yarn):
-kadmin.local -q "addprinc -randkey jhs/jhs@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey HTTP/jhs@EXAMPLE.COM"
-
-kadmin.local -q "addprinc -randkey rm/rm@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey HTTP/rm@EXAMPLE.COM"
-
-kadmin.local -q "addprinc -randkey nm/nm@EXAMPLE.COM"
-kadmin.local -q "addprinc -randkey HTTP/nm@EXAMPLE.COM"
-
-kadmin.local -q "addprinc -randkey hadoop/rm@EXAMPLE.COM"
-
-kadmin.local -q "addprinc -randkey HTTP/ozone@EXAMPLE.COM"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org