Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

default to quay based observability resources #279

Merged
merged 3 commits into from
Mar 28, 2023
Merged

default to quay based observability resources #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e33e62e
fix: default to quay based observability resources
pb82 Mar 23, 2023
3e493cc
fix: remove uses of the observability config access token
pb82 Mar 28, 2023
5992127
update KFM git ref
pb82 Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion kas-fleet-manager/deploy-kas-fleet-manager.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ deploy_kasfleetmanager() {
-p OCM_SERVICE_CLIENT_ID="" \
-p OCM_SERVICE_CLIENT_SECRET="" \
-p OCM_SERVICE_TOKEN="${OCM_SERVICE_TOKEN}" \
-p OBSERVABILITY_CONFIG_ACCESS_TOKEN="${OBSERVABILITY_CONFIG_ACCESS_TOKEN}" \
-p MAS_SSO_CRT="${SSO_TRUSTED_CA}" \
-p KAFKA_TLS_CERT="${KAFKA_TLS_CERT}" \
-p KAFKA_TLS_KEY="${KAFKA_TLS_KEY}" \
Expand Down
5 changes: 0 additions & 5 deletions kas-fleet-manager/kas-fleet-manager-deploy.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
# GitHub Personal Access token to be used by Observability Operator to fetch the
# Observability configuration from the Observability configuration git repository.
# The token should have read access to the configuration git repository.
OBSERVABILITY_CONFIG_ACCESS_TOKEN=<observability-config-access-token>

# Repository address and branch name to use for the Observability repository. Set these to test with custom Observability resources.
#OBSERVABILITY_CONFIG_REPO=https://api.github.com/repos/bf2fc6cc711aee1a0c2a/observability-resources-mk/contents
#OBSERVABILITY_CONFIG_TAG=main
Expand Down
6 changes: 3 additions & 3 deletions kas-installer-defaults.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ KAS_FLEET_MANAGER_GIT_URL="${KAS_FLEET_MANAGER_GIT_URL:-"https://github.com/bf2f
# KAS Fleet Manager's git reference. A commit ID, branch name or tag can be used. The commit ID should be compatible with
# the container image contents used
#
KAS_FLEET_MANAGER_GIT_REF="${KAS_FLEET_MANAGER_GIT_REF:-"cb483d50818dff77c108908cf80d6454a5a0b1e3"}"
KAS_FLEET_MANAGER_GIT_REF="${KAS_FLEET_MANAGER_GIT_REF:-"ac2d958bd8b993a67590adf17934e5c4585cd205"}"

# [optional]
# KAS Fleet Manager container image tag. Defaults to first seven characters of the KAS_FLEET_MANAGER_GIT_REF
Expand All @@ -161,8 +161,8 @@ OCM_CLUSTER_ID="${OCM_CLUSTER_ID:-"dev-dataplane-cluster"}"
# [optional]
# Repository address and ref to use for the Observability repository. Set these to test with custom Observability resources.
#
OBSERVABILITY_CONFIG_REPO="${OBSERVABILITY_CONFIG_REPO:-"https://api.github.com/repos/bf2fc6cc711aee1a0c2a/observability-resources-mk/contents"}"
OBSERVABILITY_CONFIG_TAG="${OBSERVABILITY_CONFIG_TAG:-"v1.50.0"}"
OBSERVABILITY_CONFIG_REPO="${OBSERVABILITY_CONFIG_REPO:-"quay.io/rhoas/observability-resources-mk"}"
OBSERVABILITY_CONFIG_TAG="${OBSERVABILITY_CONFIG_TAG:-"v1.50.2"}"

# [optional]
# Default cloud provider
Expand Down
14 changes: 0 additions & 14 deletions kas-installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,11 @@ read_kas_installer_env_file() {
fi
}

check_observability_token() {
echo "Checking validity of OBSERVABILITY_CONFIG_ACCESS_TOKEN"
curl --silent \
--head \
--header "Accept: application/vnd.github+json" \
--header "Authorization: Bearer ${OBSERVABILITY_CONFIG_ACCESS_TOKEN}" \
${OBSERVABILITY_CONFIG_REPO} \
--fail > /dev/null \
|| ( echo "failed to get observability config repo contents with OBSERVABILITY_CONFIG_ACCESS_TOKEN, check expiry and permissions" && exit 1 )
echo "OBSERVABILITY_CONFIG_ACCESS_TOKEN valid"
}

generate_kas_fleet_manager_env_config() {
echo "Generating KAS Fleet Manager configuration env file '${KAS_FLEET_MANAGER_DEPLOY_ENV_FILE} ...'"
# Make sure KAS Fleet Manager env file is empty
> ${KAS_FLEET_MANAGER_DEPLOY_ENV_FILE}

echo "OBSERVABILITY_CONFIG_ACCESS_TOKEN=${OBSERVABILITY_CONFIG_ACCESS_TOKEN}" >> ${KAS_FLEET_MANAGER_DEPLOY_ENV_FILE}
echo "OBSERVABILITY_CONFIG_REPO=${OBSERVABILITY_CONFIG_REPO}" >> ${KAS_FLEET_MANAGER_DEPLOY_ENV_FILE}
echo "OBSERVABILITY_CONFIG_TAG=${OBSERVABILITY_CONFIG_TAG}" >> ${KAS_FLEET_MANAGER_DEPLOY_ENV_FILE}
echo "OBSERVABILITY_CR_MERGE_PATCH_CONTENT='${OBSERVABILITY_CR_MERGE_PATCH_CONTENT}'" >> ${KAS_FLEET_MANAGER_DEPLOY_ENV_FILE}
Expand Down Expand Up @@ -181,7 +168,6 @@ deploy_observatorium() {
# Main body of the script starts here

read_kas_installer_env_file
check_observability_token

# Deploy and configure MAS SSO
if [ "${SSO_PROVIDER_TYPE}" = "mas_sso" ] || [ -z "${MAS_SSO_BASE_URL:-}" ] ; then
Expand Down