openstack/openstack-helm-infra
Code Issues Proposed changes

Update helm repo url

Browse Source 
The googleapi repo has been causing issues and the latest
one is giving an unauthorized error when trying to download
helm tarball.

This change moves the repo to use the official helm one.

Change-Id: I52607b0ca6d650d5f5e4a95045389970faa08cfb
This commit is contained in:
Gage Hugo 2021-08-11 10:33:19 -05:00
parent a121f3d1c2
commit 67ac5da9ed
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/build-helm-packages/defaults/main.yml
View File

@ -14,5 +14,5 @@
version: version:
helm: v2.17.0 helm: v2.17.0
url: url:
google_helm_repo: https://storage.googleapis.com/kubernetes-helm helm_repo: https://get.helm.sh
... ...

4
roles/build-helm-packages/tasks/setup-helm-serve.yaml
View File

@ -25,12 +25,12 @@
become_user: root become_user: root
shell: | shell: |
TMP_DIR=$(mktemp -d) TMP_DIR=$(mktemp -d)
curl -sSL ${GOOGLE_HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR} curl -sSL ${HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR}
sudo mv ${TMP_DIR}/helm /usr/bin/helm sudo mv ${TMP_DIR}/helm /usr/bin/helm
rm -rf ${TMP_DIR} rm -rf ${TMP_DIR}
environment: environment:
HELM_VERSION: "{{ version.helm }}" HELM_VERSION: "{{ version.helm }}"
GOOGLE_HELM_REPO_URL: "{{ url.google_helm_repo }}" HELM_REPO_URL: "{{ url.helm_repo }}"
args: args:
executable: /bin/bash executable: /bin/bash
- name: setting up helm client - name: setting up helm client

2
roles/build-images/defaults/main.yml
View File

@ -27,6 +27,6 @@ images:
url: url:
google_kubernetes_repo: https://storage.googleapis.com/kubernetes-release/release/{{ version.kubernetes }}/bin/linux/amd64 google_kubernetes_repo: https://storage.googleapis.com/kubernetes-release/release/{{ version.kubernetes }}/bin/linux/amd64
google_helm_repo: https://storage.googleapis.com/kubernetes-helm helm_repo: https://get.helm.sh
cni_repo: https://github.com/containernetworking/plugins/releases/download/{{ version.cni }} cni_repo: https://github.com/containernetworking/plugins/releases/download/{{ version.cni }}
... ...

4
tools/gate/lint.sh
View File

@ -4,14 +4,14 @@ set -e
HELM_DATA_YAML=../openstack-helm-infra/roles/build-helm-packages/defaults/main.yml HELM_DATA_YAML=../openstack-helm-infra/roles/build-helm-packages/defaults/main.yml
HELM_VERSION=$(yq -r '.version.helm' ${HELM_DATA_YAML}) HELM_VERSION=$(yq -r '.version.helm' ${HELM_DATA_YAML})
GOOGLE_HELM_REPO_URL=$(yq -r '.url.google_helm_repo' ${HELM_DATA_YAML}) HELM_REPO_URL=$(yq -r '.url.helm_repo' ${HELM_DATA_YAML})
LINT_DIR=.yamllint LINT_DIR=.yamllint
rm -rf */charts/helm-toolkit rm -rf */charts/helm-toolkit
mkdir ${LINT_DIR} mkdir ${LINT_DIR}
cp -r * ${LINT_DIR} cp -r * ${LINT_DIR}
rm -rf ${LINT_DIR}/*/templates rm -rf ${LINT_DIR}/*/templates
wget -qO ${LINT_DIR}/helm.tgz ${GOOGLE_HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz wget -qO ${LINT_DIR}/helm.tgz ${HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz
tar xzf ${LINT_DIR}/helm.tgz -C ${LINT_DIR} --strip-components=1 linux-amd64/helm tar xzf ${LINT_DIR}/helm.tgz -C ${LINT_DIR} --strip-components=1 linux-amd64/helm
for i in */; do for i in */; do

6
tools/images/kubeadm-aio/Dockerfile
View File

@ -32,8 +32,8 @@ Acquire::AllowDowngradeToInsecureRepositories \"${ALLOW_UNAUTHENTICATED}\";" \
ARG GOOGLE_KUBERNETES_REPO_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/bin/linux/amd64 ARG GOOGLE_KUBERNETES_REPO_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/bin/linux/amd64
ENV GOOGLE_KUBERNETES_REPO_URL ${GOOGLE_KUBERNETES_REPO_URL} ENV GOOGLE_KUBERNETES_REPO_URL ${GOOGLE_KUBERNETES_REPO_URL}
ARG GOOGLE_HELM_REPO_URL=https://storage.googleapis.com/kubernetes-helm ARG HELM_REPO_URL=https://get.helm.sh
ENV GOOGLE_HELM_REPO_URL ${GOOGLE_HELM_REPO_URL} ENV HELM_REPO_URL ${HELM_REPO_URL}
ARG KUBE_VERSION="v1.18.9" ARG KUBE_VERSION="v1.18.9"
ENV KUBE_VERSION ${KUBE_VERSION} ENV KUBE_VERSION ${KUBE_VERSION}
@ -100,7 +100,7 @@ RUN set -ex ;\
curl -sSL ${CNI_REPO_URL}/cni-plugins-linux-amd64-$CNI_VERSION.tgz | \ curl -sSL ${CNI_REPO_URL}/cni-plugins-linux-amd64-$CNI_VERSION.tgz | \
tar -zxv --strip-components=1 -C /opt/assets${CNI_BIN_DIR} ;\ tar -zxv --strip-components=1 -C /opt/assets${CNI_BIN_DIR} ;\
TMP_DIR=$(mktemp -d) ;\ TMP_DIR=$(mktemp -d) ;\
curl -sSL ${GOOGLE_HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR} ;\ curl -sSL ${HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR} ;\
mv ${TMP_DIR}/helm /usr/bin/helm ;\ mv ${TMP_DIR}/helm /usr/bin/helm ;\
rm -rf ${TMP_DIR} ;\ rm -rf ${TMP_DIR} ;\
apt-get purge -y --auto-remove \ apt-get purge -y --auto-remove \