[Fix] fixing installers away from personal repo

betterup · Apr 9, 2024 · 9311fec · 9311fec
1 parent 556e664
commit 9311fec
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -35,7 +35,10 @@ 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
+
+RUN curl -LO https://github.com/getsops/sops/releases/download/v3.8.1/sops-v3.8.1.linux.amd64 \
+  && mv sops-v3.8.1.linux.amd64 /usr/local/bin/sops \
+  && chmod +x /usr/local/bin/sops
 
 ####################################################################################################
 # Argo CD Base - used as the base for both the release and dev argocd images

diff --git a/hack/installers/install-helm-linux.sh b/hack/installers/install-helm-linux.sh
@@ -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
diff --git a/hack/installers/install-kubectl-linux.sh b/hack/installers/install-kubectl-linux.sh
@@ -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

diff --git a/hack/installers/install-kustomize.sh b/hack/installers/install-kustomize.sh
@@ -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}