From 65e0583367cad72a95b717502240bd7992810f8e Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 28 Nov 2023 21:26:57 +0000 Subject: [PATCH] Add sslscan to workflow --- .github/workflows/test-command.yml | 4 ++++ utils/metallb/dns.sh | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-command.yml b/.github/workflows/test-command.yml index b9ce4d9..ca4d417 100644 --- a/.github/workflows/test-command.yml +++ b/.github/workflows/test-command.yml @@ -103,6 +103,10 @@ jobs: brew tap defenseunicorns/tap brew install uds + - name: Install sslscan via homebrew + run: | + apt install sslscan -y + - name: Build gitlab and all dependencies run: | uds run ci-build-all diff --git a/utils/metallb/dns.sh b/utils/metallb/dns.sh index 8d17cc2..b0a5bdd 100755 --- a/utils/metallb/dns.sh +++ b/utils/metallb/dns.sh @@ -4,11 +4,11 @@ HOST_LIST=$(kubectl get vs -A -o=jsonpath='{range .items[*]}{.spec.gateways[*]}{ TENANT_HOSTS=$(echo "${HOST_LIST}" | grep tenant | cut -d ' ' -f2) ADMIN_HOSTS=$(echo "${HOST_LIST}" | grep admin | cut -d ' ' -f2) -PASSTHROUGH_HOSTS=$(echo "${HOST_LIST}" | grep passthrough | cut -d ' ' -f2) +# PASSTHROUGH_HOSTS=$(echo "${HOST_LIST}" | grep passthrough | cut -d ' ' -f2) TENANT_LB_IP=$(kubectl get svc -n istio-system tenant-ingressgateway -o=jsonpath="{.status.loadBalancer.ingress[*]['hostname', 'ip']}") ADMIN_LB_IP=$(kubectl get svc -n istio-system admin-ingressgateway -o=jsonpath="{.status.loadBalancer.ingress[*]['hostname', 'ip']}") -PASSTHROUGH_LB_IP=$(kubectl get svc -n istio-system keycloak-ingressgateway -o=jsonpath="{.status.loadBalancer.ingress[*]['hostname', 'ip']}") +# PASSTHROUGH_LB_IP=$(kubectl get svc -n istio-system keycloak-ingressgateway -o=jsonpath="{.status.loadBalancer.ingress[*]['hostname', 'ip']}") if [[ "${TENANT_LB_IP}" =~ [a-zA-Z] ]] ; then TENANT_LB_IP=$(dig +short "${TENANT_LB_IP}") @@ -18,9 +18,9 @@ if [[ "${ADMIN_LB_IP}" =~ [a-zA-Z] ]] ; then ADMIN_LB_IP=$(dig +short "${ADMIN_LB_IP}") fi -if [[ "${PASSTHROUGH_LB_IP}" =~ [a-zA-Z] ]] ; then - PASSTHROUGH_LB_IP=$(dig +short "${PASSTHROUGH_LB_IP}") -fi +# if [[ "${PASSTHROUGH_LB_IP}" =~ [a-zA-Z] ]] ; then +# PASSTHROUGH_LB_IP=$(dig +short "${PASSTHROUGH_LB_IP}") +# fi echo "# Following entries are from metallb dns.sh" >> hosts.patch @@ -36,10 +36,10 @@ for host in $ADMIN_HOSTS; do echo "${ADMIN_LB_IP} ${host}" >> hosts.patch done -echo "# Passthrough hostnames" >> hosts.patch +# echo "# Passthrough hostnames" >> hosts.patch -for host in $PASSTHROUGH_HOSTS; do - echo "${PASSTHROUGH_LB_IP} ${host}" >> hosts.patch -done +# for host in $PASSTHROUGH_HOSTS; do +# echo "${PASSTHROUGH_LB_IP} ${host}" >> hosts.patch +# done echo "# End of metallb dns.sh" >> hosts.patch