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

Jump to bottom

[Cherry-pick] fix: get ingressControllerIP based on ingressControllerServiceType #1558

Merged
merged 1 commit into from
Jul 28, 2023
Merged

[Cherry-pick] fix: get ingressControllerIP based on ingressControllerServiceType #1558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 21 additions & 4 deletions test/e2e/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ class HarborChartFreshInstallPipelineExecutor extends FreshInstallPipelineExecut
String context
String namespace
String coreHostname
String ingressControllerServiceType
String ingressControllerIP

HarborChartFreshInstallPipelineExecutor(Script script) {
Expand Down Expand Up @@ -36,13 +37,29 @@ class HarborChartFreshInstallPipelineExecutor extends FreshInstallPipelineExecut
HarborInstance install(){
// the scope of the credential is just inside the "withCredentials" block, so we need to call "withCredentials" again
script.withCredentials([script.file(credentialsId: "kubeconfig", variable: "KUBE_CONFIG_FILE_PATH")]) {
// get the IP address of the ingress controller
ingressControllerIP = script.sh(
// get the service type of the ingress controller
ingressControllerServiceType = script.sh(
returnStdout: true,
script:"""
script: """
docker run -i --rm -v \${KUBE_CONFIG_FILE_PATH}:/root/.kube/config deployer:dev \
sh -c 'host \$(kubectl get svc nginx-ingress-controller-controller --context ${context} -n ingress-controller -o jsonpath="{.status.loadBalancer.ingress[0].hostname}") | awk "/has address/ { print \\\$4; exit }"'
sh -c 'kubectl get svc ingress-nginx-controller --context ${context} -n ingress-nginx -o jsonpath="{.spec.type}"'
""").trim()
// get the IP address of the ingress controller
if (ingressControllerServiceType == 'LoadBalancer') {
ingressControllerIP = script.sh(
returnStdout: true,
script: """
docker run -i --rm -v \${KUBE_CONFIG_FILE_PATH}:/root/.kube/config deployer:dev \
sh -c 'host \$(kubectl get svc ingress-nginx-controller --context ${context} -n ingress-nginx -o jsonpath="{.status.loadBalancer.ingress[0].hostname}") | awk "/has address/ { print \\\$4; exit }"'
""").trim()
} else if (ingressControllerServiceType == 'NodePort') {
ingressControllerIP = script.sh(
returnStdout: true,
script: """
docker run -i --rm -v \${KUBE_CONFIG_FILE_PATH}:/root/.kube/config deployer:dev \
sh -c 'kubectl get svc ingress-nginx-controller --context ${context} -n ingress-nginx -o jsonpath="{.spec.externalIPs[0]}"'
""").trim()
}
// install harbor chart
script.sh """
# insert the hostAliases to run the replication test
Expand Down
Loading