Skip to content

Commit

Permalink
Merge pull request #14 from betterup/broken_pipeline
Browse files Browse the repository at this point in the history
[Fix] fixing installers away from personal repo
  • Loading branch information
cdowning-betterup authored Apr 9, 2024
2 parents 0ffbd7e + f087117 commit 91dc7b6
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-scan-push.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Build, Scan, and Push ArgoCD to ghcr.io

on:
workflow_dispatch:
push:
branches:
- master
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ RUN ./install.sh helm-linux
RUN INSTALL_PATH=/usr/local/bin ./install.sh kustomize
RUN ./install.sh kubectl-linux

RUN curl -fsSL "https://github.com/voidspooks/sops/releases/download/v${SOPS_VERSION}/sops" \
-o /usr/local/bin/sops && chmod +x /usr/local/bin/sops
COPY --from=quay.io/getsops/sops:v3.8.1-alpine /usr/local/bin/sops /usr/local/bin/sops

####################################################################################################
# Argo CD Base - used as the base for both the release and dev argocd images
Expand Down
5 changes: 4 additions & 1 deletion hack/installers/install-helm-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ set -eux -o pipefail
# $(dirname $0)/compare-chksum.sh
# mkdir -p /tmp/helm && tar -C /tmp/helm -xf $DOWNLOADS/${TARGET_FILE}
# sudo install -m 0755 /tmp/helm/linux-$ARCHITECTURE/helm $BIN/helm

mkdir -p /tmp/helm && cd /tmp/helm
curl -LO https://github.com/voidspooks/helm/releases/download/v3.12.4/helm
curl -LO https://get.helm.sh/helm-v3.14.3-linux-amd64.tar.gz
tar zxf helm-v3.14.3-linux-amd64.tar.gz
cd helm-v3.14.3-linux-amd64
chmod +x helm
cp helm $BIN/helm
helm version --client
2 changes: 1 addition & 1 deletion hack/installers/install-kubectl-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -eux -o pipefail
. $(dirname $0)/../tool-versions.sh

mkdir -p /tmp/kubectl && cd /tmp/kubectl
curl -LO https://github.com/voidspooks/kubernetes/releases/download/v${kubectl_version}/kubectl
curl -O https://s3.us-west-2.amazonaws.com/amazon-eks/1.26.12/2024-01-04/bin/darwin/amd64/kubectl
chmod +x kubectl
cp kubectl $BIN/kubectl
kubectl version --client
Expand Down
6 changes: 3 additions & 3 deletions hack/installers/install-kustomize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ PATH="${INSTALL_PATH}:${PATH}"
[ -d $INSTALL_PATH ] || mkdir -p $INSTALL_PATH

mkdir -p /tmp/kustomize && cd /tmp/kustomize
curl -LO https://github.com/voidspooks/kustomize/releases/download/v${kustomize5_version}/kustomize
chmod +x kustomize
cp kustomize $INSTALL_PATH/kustomize
curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
#chmod +x kustomize
#cp kustomize $INSTALL_PATH/kustomize
kustomize version

# KUSTOMIZE_VERSION=${KUSTOMIZE_VERSION:-$kustomize5_version}
Expand Down

0 comments on commit 91dc7b6

Please sign in to comment.