Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
!scm-manager/
!scripts/jenkins/
!scripts/scm-manager/
!scripts/utils.sh
!scripts/apply-ng.sh
!scripts/downloadHelmCharts.sh
!templates/kubernetes/rbac/
Expand Down
20 changes: 11 additions & 9 deletions scripts/get-remote-url
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
#!/usr/bin/env bash
set -o errexit -o nounset -o pipefail

BASEDIR=$(dirname $0)
ABSOLUTE_BASEDIR="$(cd ${BASEDIR} && pwd)"
function getExternalIP() {
local serviceName="$1"
local namespace="$2"
local externalIp=""

# Allow for running this script directly via curl without redundant code
if [[ -f ${ABSOLUTE_BASEDIR}/utils.sh ]]; then
source ${ABSOLUTE_BASEDIR}/utils.sh
else
source <(curl -s https://raw.githubusercontent.com/cloudogu/gitops-playground/main/scripts/utils.sh)
fi
while [[ -z "${externalIp}" ]]; do
externalIp=$(kubectl -n "${namespace}" get svc "${serviceName}" -o=jsonpath="{.status.loadBalancer.ingress[0]['hostname','ip']}")
[[ -z "${externalIp}" ]] && sleep 10
done
echo "${externalIp}"
}

serviceName="$1"
namespace="$2"
Expand All @@ -20,4 +22,4 @@ if [[ -z "${ip}" ]]; then
exit 1;
else
echo http://${ip}
fi
fi
5 changes: 0 additions & 5 deletions scripts/jenkins/init-jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ set -o errexit -o nounset -o pipefail

ABSOLUTE_BASEDIR="$(cd "$(dirname $0)" && pwd)"

source ${ABSOLUTE_BASEDIR}/../utils.sh
source ${ABSOLUTE_BASEDIR}/jenkins-REST-client.sh

if [[ $TRACE == true ]]; then
Expand All @@ -20,10 +19,6 @@ if [[ $INSECURE == true ]]; then
fi

function initJenkins() {
if [[ ${INTERNAL_JENKINS} == true ]]; then
setExternalHostnameIfNecessary "JENKINS" "jenkins" "${NAME_PREFIX}jenkins"
fi

installPlugins
}

Expand Down
21 changes: 0 additions & 21 deletions scripts/utils.sh

This file was deleted.

Loading
Loading