honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix rename issues and failing repository-hdfs tests. (#518) 

This commit fixes some partial rename issues and as a result fixes the failing secure repository-hdfs tests.

Signed-off-by: Rabi Panda <adnapibar@gmail.com>
This commit is contained in:
Rabi Panda 2021-04-09 17:51:27 -07:00 committed by GitHub
parent f14bc54c48
commit 2a3ce0bb75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/repository-hdfs/build.gradle
View File

@ -114,7 +114,7 @@ testClusters.integTest {
plugin(project.tasks.bundlePlugin.archiveFile)
}
String realm = "BUILD.ELASTIC.CO"
String realm = "BUILD.OPENSEARCH.ORG"
String krb5conf = project(':test:fixtures:krb5kdc-fixture').ext.krb5Conf("hdfs")
// Create HDFS File System Testing Fixtures for HA/Secure combinations

6
test/fixtures/krb5kdc-fixture/src/main/resources/env.properties vendored
View File

@ -26,6 +26,12 @@
# specific language governing permissions and limitations
# under the License.
#
# Modifications Copyright OpenSearch Contributors. See
# GitHub history for details.
#
realm=BUILD.OPENSEARCH.ORG
kdc=kerberos.build.opensearch.org
zone=build.opensearch.org

12
test/fixtures/krb5kdc-fixture/src/main/resources/provision/hdfs.sh vendored
View File

@ -1,10 +1,20 @@
#!/bin/bash
#
# SPDX-License-Identifier: Apache-2.0
#
# The OpenSearch Contributors require contributions made to
# this file be licensed under the Apache-2.0 license or a
# compatible open source license.
#
# Modifications Copyright OpenSearch Contributors. See
# GitHub history for details.
#
set -e
addprinc.sh "opensearch"
#TODO(OpenSearch): fix username
addprinc.sh "hdfs/hdfs.build.opensearch.co"
addprinc.sh "hdfs/hdfs.build.opensearch.org"
# Use this as a signal that setup is complete
python3 -m http.server 4444 &

18
test/fixtures/krb5kdc-fixture/src/main/resources/provision/installkdc.sh vendored
View File

@ -1,4 +1,11 @@
#!/bin/bash
#
# SPDX-License-Identifier: Apache-2.0
#
# The OpenSearch Contributors require contributions made to
# this file be licensed under the Apache-2.0 license or a
# compatible open source license.
#
# Licensed to Elasticsearch under one or more contributor
# license agreements. See the NOTICE file distributed with
@ -17,6 +24,11 @@
# specific language governing permissions and limitations
# under the License.
#
# Modifications Copyright OpenSearch Contributors. See
# GitHub history for details.
#
set -e
# KDC installation steps and considerations based on https://web.mit.edu/kerberos/krb5-latest/doc/admin/install_kdc.html
@ -35,14 +47,14 @@ MARKER_FILE=/etc/marker
REALM_NAME=$(cat $ENVPROP_FILE | grep realm= | cut -d '=' -f 2)
KDC_NAME=$(cat $ENVPROP_FILE | grep kdc= | cut -d '=' -f 2)
BUILD_ZONE=$(cat $ENVPROP_FILE | grep zone= | cut -d '=' -f 2)
ELASTIC_ZONE=$(echo $BUILD_ZONE | cut -d '.' -f 1,2)
OPENSEARCH_ZONE=$(echo $BUILD_ZONE | cut -d '.' -f 1,2)
# Transfer and interpolate krb5.conf
cp $PROV_DIR/krb5.conf.template $LOCALSTATEDIR/krb5.conf
sed -i 's/${REALM_NAME}/'$REALM_NAME'/g' $LOCALSTATEDIR/krb5.conf
sed -i 's/${KDC_NAME}/'$KDC_NAME'/g' $LOCALSTATEDIR/krb5.conf
sed -i 's/${BUILD_ZONE}/'$BUILD_ZONE'/g' $LOCALSTATEDIR/krb5.conf
sed -i 's/${ELASTIC_ZONE}/'$ELASTIC_ZONE'/g' $LOCALSTATEDIR/krb5.conf
sed -i 's/${OPENSEARCH_ZONE}/'$OPENSEARCH_ZONE'/g' $LOCALSTATEDIR/krb5.conf
# Transfer and interpolate the kdc.conf
@ -51,7 +63,7 @@ cp $PROV_DIR/kdc.conf.template $LOCALSTATEDIR/krb5kdc/kdc.conf
sed -i 's/${REALM_NAME}/'$REALM_NAME'/g' $LOCALSTATEDIR/krb5kdc/kdc.conf
sed -i 's/${KDC_NAME}/'$KDC_NAME'/g' $LOCALSTATEDIR/krb5kdc/kdc.conf
sed -i 's/${BUILD_ZONE}/'$BUILD_ZONE'/g' $LOCALSTATEDIR/krb5kdc/kdc.conf
sed -i 's/${ELASTIC_ZONE}/'$ELASTIC_ZONE'/g' $LOCALSTATEDIR/krb5.conf
sed -i 's/${OPENSEARCH_ZONE}/'$OPENSEARCH_ZONE'/g' $LOCALSTATEDIR/krb5.conf
# Touch logging locations
mkdir -p $LOGDIR

17
test/fixtures/krb5kdc-fixture/src/main/resources/provision/krb5.conf.template vendored
View File

@ -1,3 +1,11 @@
#
# SPDX-License-Identifier: Apache-2.0
#
# The OpenSearch Contributors require contributions made to
# this file be licensed under the Apache-2.0 license or a
# compatible open source license.
#
# Licensed to Elasticsearch under one or more contributor
# license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright
@ -15,6 +23,11 @@
# specific language governing permissions and limitations
# under the License.
#
# Modifications Copyright OpenSearch Contributors. See
# GitHub history for details.
#
[libdefaults]
default_realm = ${REALM_NAME}
dns_canonicalize_hostname = false
@ -42,6 +55,6 @@
[domain_realm]
${BUILD_ZONE} = ${REALM_NAME}
.${BUILD_ZONE} = ${REALM_NAME}
${ELASTIC_ZONE} = ${REALM_NAME}
.${ELASTIC_ZONE} = ${REALM_NAME}
${OPENSEARCH_ZONE} = ${REALM_NAME}
.${OPENSEARCH_ZONE} = ${REALM_NAME}