d3c6069be3
This change primarily changes the type of the api_objects yaml structure to a map, which allows for additional objects to be added by values overrides (Arrays/Lists are not mutable like this) Also, in the previous change, some scripts in HTK were modified, while other were copied over to the Elasticsearch chart. To simplify the chart's structure, this change also moves the create_s3_bucket script to Elasticsearch, and reverts the changes in HTK. Those HTK scripts are no longer referenced by osh charts, and could be candidates for removal if that chart needed to be pruned Change-Id: I7d8d7ef28223948437450dcb64bd03f2975ad54d
65 lines
2.2 KiB
Smarty
65 lines
2.2 KiB
Smarty
{{/*
|
|
Licensed 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.
|
|
*/}}
|
|
{{- define "helm-toolkit.scripts.create_s3_user" }}
|
|
#!/bin/bash
|
|
set -e
|
|
function create_s3_user () {
|
|
echo "Creating s3 user and key pair"
|
|
radosgw-admin user create \
|
|
--uid=${S3_USERNAME} \
|
|
--display-name=${S3_USERNAME} \
|
|
--key-type=s3 \
|
|
--access-key ${S3_ACCESS_KEY} \
|
|
--secret-key ${S3_SECRET_KEY}
|
|
}
|
|
function update_s3_user () {
|
|
# Retrieve old access keys, if they exist
|
|
old_access_keys=$(radosgw-admin user info --uid=${S3_USERNAME} \
|
|
| jq -r '.keys[].access_key' || true)
|
|
|
|
if [[ ! -z ${old_access_keys} ]]; then
|
|
for access_key in $old_access_keys; do
|
|
# If current access key is the same as the key supplied, do nothing.
|
|
if [ "$access_key" == "${S3_ACCESS_KEY}" ]; then
|
|
echo "Current user and key pair exists."
|
|
continue
|
|
else
|
|
# If keys differ, remove previous key
|
|
radosgw-admin key rm --uid=${S3_USERNAME} --key-type=s3 --access-key=$access_key
|
|
fi
|
|
done
|
|
fi
|
|
|
|
# Perform one more additional check to account for scenarios where multiple
|
|
# key pairs existed previously, but one existing key was the supplied key
|
|
current_access_key=$(radosgw-admin user info --uid=${S3_USERNAME} \
|
|
| jq -r '.keys[].access_key' || true)
|
|
|
|
# If the supplied key does not exist, modify the user
|
|
if [[ -z ${current_access_key} ]]; then
|
|
# Modify user with new access and secret keys
|
|
echo "Updating existing user's key pair"
|
|
radosgw-admin user modify \
|
|
--uid=${S3_USERNAME}\
|
|
--access-key ${S3_ACCESS_KEY} \
|
|
--secret-key ${S3_SECRET_KEY}
|
|
fi
|
|
}
|
|
user_exists=$(radosgw-admin user info --uid=${S3_USERNAME} || true)
|
|
if [[ -z ${user_exists} ]]; then
|
|
create_s3_user
|
|
else
|
|
update_s3_user
|
|
fi
|
|
{{- end }} |