diff --git a/marketplace/deployer_envsubst_base/Dockerfile b/marketplace/deployer_envsubst_base/Dockerfile index 5c3ece29..fce79580 100644 --- a/marketplace/deployer_envsubst_base/Dockerfile +++ b/marketplace/deployer_envsubst_base/Dockerfile @@ -17,7 +17,7 @@ RUN pip3 install \ pyyaml \ six -RUN for full_version in 1.24.10 1.24.10 1.26.2; \ +RUN for full_version in 1.26.5 1.26.5 1.27.2; \ do \ version=${full_version%.*} \ && mkdir -p /opt/kubectl/$version \ @@ -25,7 +25,7 @@ RUN for full_version in 1.24.10 1.24.10 1.26.2; \ https://storage.googleapis.com/kubernetes-release/release/v$full_version/bin/linux/amd64/kubectl \ && chmod 755 /opt/kubectl/$version/kubectl; \ done; -RUN ln -s /opt/kubectl/1.24 /opt/kubectl/default +RUN ln -s /opt/kubectl/1.26 /opt/kubectl/default COPY marketplace/deployer_envsubst_base/* /bin/ COPY marketplace/deployer_util/* /bin/ diff --git a/marketplace/deployer_helm_base/Dockerfile b/marketplace/deployer_helm_base/Dockerfile index 5272ef9d..8ce7b1c6 100644 --- a/marketplace/deployer_helm_base/Dockerfile +++ b/marketplace/deployer_helm_base/Dockerfile @@ -17,7 +17,7 @@ RUN pip3 install \ pyyaml \ six -RUN for full_version in 1.24.10 1.24.10 1.26.2; \ +RUN for full_version in 1.26.5 1.26.5 1.27.2; \ do \ version=${full_version%.*} \ && mkdir -p /opt/kubectl/$version \ @@ -25,11 +25,11 @@ RUN for full_version in 1.24.10 1.24.10 1.26.2; \ https://storage.googleapis.com/kubernetes-release/release/v$full_version/bin/linux/amd64/kubectl \ && chmod 755 /opt/kubectl/$version/kubectl; \ done; -RUN ln -s /opt/kubectl/1.24 /opt/kubectl/default +RUN ln -s /opt/kubectl/1.26 /opt/kubectl/default RUN mkdir -p /bin/helm-downloaded \ && wget -q -O /bin/helm-downloaded/helm.tar.gz \ - https://get.helm.sh/helm-v3.11.2-linux-amd64.tar.gz \ + https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz \ && tar -zxvf /bin/helm-downloaded/helm.tar.gz -C /bin/helm-downloaded \ && mv /bin/helm-downloaded/linux-amd64/helm /bin/ \ && rm -rf /bin/helm-downloaded diff --git a/marketplace/deployer_util/provision.py b/marketplace/deployer_util/provision.py index b2badb14..06e9b619 100755 --- a/marketplace/deployer_util/provision.py +++ b/marketplace/deployer_util/provision.py @@ -528,7 +528,9 @@ def make_v1_config(schema, namespace, app_name, labels, app_params): 'namespace': namespace, 'labels': labels, }, - 'data': {k: str(v) for k, v in app_params.items()}, + 'data': { + k: str(v) for k, v in app_params.items() + }, } diff --git a/marketplace/dev/Dockerfile b/marketplace/dev/Dockerfile index 71a95a89..5d7c48bb 100644 --- a/marketplace/dev/Dockerfile +++ b/marketplace/dev/Dockerfile @@ -27,7 +27,7 @@ RUN pip3 install \ pyyaml \ six -RUN for full_version in 1.24.10 1.24.10 1.26.2; \ +RUN for full_version in 1.26.5 1.26.5 1.27.2; \ do \ version=${full_version%.*} \ && mkdir -p /opt/kubectl/$version \ @@ -35,7 +35,7 @@ RUN for full_version in 1.24.10 1.24.10 1.26.2; \ https://storage.googleapis.com/kubernetes-release/release/v$full_version/bin/linux/amd64/kubectl \ && chmod 755 /opt/kubectl/$version/kubectl; \ done; -RUN ln -s /opt/kubectl/1.24 /opt/kubectl/default +RUN ln -s /opt/kubectl/1.26 /opt/kubectl/default RUN echo "deb [signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu focal edge" | tee /etc/apt/sources.list.d/docker.list \ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key --keyring /usr/share/keyrings/docker.gpg add - \ @@ -44,7 +44,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/docker.gpg] https://download.docker RUN mkdir -p /bin/helm-downloaded \ && wget -q -O /bin/helm-downloaded/helm.tar.gz \ - https://get.helm.sh/helm-v3.11.2-linux-amd64.tar.gz \ + https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz \ && tar -zxvf /bin/helm-downloaded/helm.tar.gz -C /bin/helm-downloaded \ && mv /bin/helm-downloaded/linux-amd64/helm /bin/ \ && rm -rf /bin/helm-downloaded