Merge pull request 'chore(deps): update dependency helm/helm to v3.9.1' (#13) from renovate/helm-helm-3.x into master

Reviewed-on: #13

.drone.yml

@@ -10,11 +10,11 @@ steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.30.0
+  image: docker.io/volkerraschek/markdownlint:0.31.1
   resources:
     limits:
-      cpu: 50
-      memory: 50M
+      cpu: 150
+      memory: 150M
 
 - name: email-notification
   environment:
@@ -29,8 +29,8 @@ steps:
   image: docker.io/drillster/drone-email:latest
   resources:
     limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
   when:
     status:
     - changed
@@ -52,7 +52,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -71,7 +71,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -115,7 +115,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -131,7 +131,7 @@ steps:
       from_secret: container_image_registry_password
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -178,7 +178,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -194,7 +194,7 @@ steps:
       from_secret: container_image_registry_password
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -241,7 +241,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -259,7 +259,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -302,7 +302,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -317,7 +317,7 @@ steps:
       from_secret: container_image_registry_password
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -363,7 +363,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -378,7 +378,7 @@ steps:
       from_secret: container_image_registry_password
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -420,7 +420,7 @@ name: latest-manifest
 
 steps:
 - name: build-manifest
-  image: plugins/manifest
+  image: docker.io/plugins/manifest:latest
   settings:
     auto_tag: false
     ignore_missing: true
@@ -443,8 +443,8 @@ steps:
       from_secret: smtp_mail_address
   resources:
     limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
   when:
     status:
     - changed
@@ -475,7 +475,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     auto_tag_suffix: amd64
     auto_tag: true
@@ -495,7 +495,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -532,7 +532,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     auto_tag_suffix: arm-v7
     auto_tag: true
@@ -552,7 +552,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -589,7 +589,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     auto_tag_suffix: arm64-v8
     auto_tag: true
@@ -609,7 +609,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -642,7 +642,7 @@ name: tagged-manifest
 
 steps:
 - name: build-manifest
-  image: plugins/manifest
+  image: docker.io/plugins/manifest:latest
   settings:
     auto_tag: true
     ignore_missing: true
@@ -665,8 +665,8 @@ steps:
       from_secret: smtp_mail_address
   resources:
     limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
   when:
     status:
     - changed
@@ -682,58 +682,3 @@ trigger:
   - tag
   repo:
   - volker.raschek/helm-docker
-
----
-kind: pipeline
-type: kubernetes
-name: sync
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: github
-  image: docker.io/appleboy/drone-git-push:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  settings:
-    branch: master
-    remote: ssh://git@github.com/volker-raschek/helm-docker.git
-    force: true
-    ssh_key:
-      from_secret: ssh_key
-
-- name: email-notification
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-depends_on:
-- latest-manifest
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/helm-docker

Dockerfile

@@ -1,11 +1,16 @@
-FROM docker.io/library/alpine:3.14
+FROM docker.io/library/alpine:3.15
 
 ARG HELM_VERSION
 
-COPY install.sh /install.sh
-RUN VERSION=${HELM_VERSION} /install.sh
+RUN apk add bash curl git openssl && \
+    curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 --output /tmp/install.sh
+
+RUN [[ ${HELM_VERSION} == "" ]]; bash /tmp/install.sh
+RUN [[ ${HELM_VERSION} != "" ]]; bash /tmp/install.sh --version ${HELM_VERSION}
+
+RUN rm /tmp/install.sh
 
 # Install additionally cm-push plugin
 RUN helm plugin install https://github.com/chartmuseum/helm-push.git
 
-ENTRYPOINT [ "/usr/bin/helm" ]
+ENTRYPOINT [ "/usr/local/bin/helm" ]

Makefile

@@ -1,6 +1,6 @@
 # HELM_VERSION
 # Only required to install a specifiy version
-HELM_VERSION?=v3.8.0 # renovate: datasource=github-releases depName=helm lookupName=helm/helm versioning=semver
+HELM_VERSION?=v3.9.1 # renovate: datasource=github-releases depName=helm/helm
 
 # CONTAINER_RUNTIME
 # The CONTAINER_RUNTIME variable will be used to specified the path to a
@@ -49,4 +49,4 @@ container-image/push:
 # ==============================================================================
 # Declare the contents of the PHONY variable as phony.  We keep that information
 # in a variable so we can use it in if_changed.
-.PHONY: ${PHONY}
+.PHONY: ${PHONY}

install.sh

@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -xe
-
-BASE_URL=https://get.helm.sh
-
-if [ -z ${VERSION+x} ]; then
-  echo ${VERSION} not defined
-  exit 1
-fi
-
-case `uname -m` in
-  x86_64)
-    ARCH=amd64
-  ;;
-  armv7l)
-    ARCH=arm
-  ;;
-  aarch64)
-    ARCH=arm64
-  ;;
-  ppc64le)
-    ARCH=ppc64le
-  ;;
-  s390x)
-    ARCH=s390x
-  ;;
-  *)
-    echo "un-supported arch, exit ..."
-    exit 1
-  ;;
-esac
-
-apk add --update --no-cache wget git
-wget ${BASE_URL}/helm-${VERSION}-linux-${ARCH}.tar.gz -O - | tar -xz
-mv linux-${ARCH}/helm /usr/bin/helm
-chmod +x /usr/bin/helm
-rm -rf linux-${ARCH}