Skip to content

Commit

Permalink
fix: add 'kubectl' to the image
Browse files Browse the repository at this point in the history
  • Loading branch information
Roming22 committed Sep 10, 2024
1 parent 6e9dc9a commit e2c1ac3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@ RUN make GOFLAGS='-buildvcs=false'

FROM registry.access.redhat.com/ubi9-minimal:9.4-1227

ARG OC_VERSION=4.14.8

WORKDIR /rhtap-cli

COPY --from=quay.io/codeready-toolchain/oc-client-base:latest /usr/bin/kubectl /usr/bin/

COPY --from=builder /workdir/rhtap-cli/charts ./charts/
COPY --from=builder /workdir/rhtap-cli/scripts ./scripts/
COPY --from=builder /workdir/rhtap-cli/config.yaml .

COPY --from=builder /workdir/rhtap-cli/bin/rhtap-cli .

RUN microdnf install shadow-utils && \
Expand Down
4 changes: 2 additions & 2 deletions charts/rhtap-dh/hooks/post-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ app_namespaces() {
### Helm does not support the patching of resources.
NAMESPACE="$INSTALLER__DEVELOPERHUB__NAMESPACE"

echo -n "* Patching ServiceAccounts in $NAMESPACE-app-*: "
for env in "development" "prod" "stage"; do
for SA in "default" "pipeline"; do
echo -n "- Patching ServiceAccount '$SA' in '$NAMESPACE-app-$env': "
until kubectl get serviceaccounts --namespace "$NAMESPACE-app-$env" "$SA" >/dev/null 2>&1; do
echo -n "_"
sleep 2
Expand All @@ -22,9 +22,9 @@ secrets:
imagePullSecrets:
- name: quay-auth
" >/dev/null
echo "OK"
done
done
echo "OK"
}

#
Expand Down

0 comments on commit e2c1ac3

Please sign in to comment.