Merge pull request #47 from appuio/deprecations

Remove deprecated image-cleanup and use Helm v3 by default

README.md

@@ -30,11 +30,8 @@ The built images are available from [Docker Hub][hub]
 
 ## Caveats
 
-- `image-cleanup` will be removed by June 1, 2020.
-  It has been renamed to `seiso` and its usage has changed too (see [seiso])
-- This image now includes both Helm v2 and v3. Helm v3 is available as `helm3`,
-  and `helm` currently symlinks to `helm2`.
-  Helm v3 is going to be the default by June 1, 2020.
+- This image includes both Helm v2 and v3. Helm v3 is available as `helm3`, v2 as `helm2`
+  and `helm` symlinks to `helm3`.
 
 ## Development
 

src/Dockerfile

@@ -5,15 +5,13 @@ ENV VERSION=%%VERSION%% \
     HELM3_VERSION=%%HELM3_VERSION%% \
     KUSTOMIZE_VERSION=%%KUSTOMIZE_VERSION%% \
     SEISO_VERSION=%%SEISO_VERSION%% \
-    IMAGE_CLEANUP_VERSION=%%IMAGE_CLEANUP_VERSION%% \
     KUBEVAL_VERSION=%%KUBEVAL_VERSION%% \
     ARCHIVE=%%ARCHIVE%% \
     SHA256SUM=%%SHA256SUM%% \
     HELM2_SHA256SUM=%%HELM2_SHA256SUM%% \
     HELM3_SHA256SUM=%%HELM3_SHA256SUM%% \
     KUSTOMIZE_SHA256SUM=%%KUSTOMIZE_SHA256SUM%% \
     SEISO_SHA256SUM=%%SEISO_SHA256SUM%% \
-    IMAGE_CLEANUP_SHA256SUM=%%IMAGE_CLEANUP_SHA256SUM%% \
     KUBEVAL_SHA256SUM=%%KUBEVAL_SHA256SUM%% \
     SOPS_VERSION=%%SOPS_VERSION%% \
     SOPS_RELEASES_URL="https://github.com/mozilla/sops/releases/download" \
@@ -26,16 +24,12 @@ ENV VERSION=%%VERSION%% \
     OC_PLUGINS_REPO="https://github.com/appuio/oc-plugins" \
     KUBECTL_PLUGINS_PATH="/opt/kube/plugins"
 
-COPY opt/helm2-deprecation.sh /opt/
-COPY image-cleanup.sh /bin/image-cleanup
-
 RUN set -x && \
     URL="${OKD_DOWNLOAD_BASE_URL}/${VERSION}/${ARCHIVE}.tar.gz" && \
     HELM2_URL="${HELM_RELEASES_URL}/helm-${HELM2_VERSION}-linux-amd64.tar.gz" && \
     HELM3_URL="${HELM_RELEASES_URL}/helm-${HELM3_VERSION}-linux-amd64.tar.gz" && \
     KUSTOMIZE_URL="${KUSTOMIZE_RELEASES_URL}/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz" && \
     SEISO_URL="${SEISO_RELEASES_URL}/${SEISO_VERSION}/seiso_linux_amd64" && \
-    IMAGE_CLEANUP_URL="${SEISO_RELEASES_URL}/${IMAGE_CLEANUP_VERSION}/image-cleanup_linux_amd64" && \
     KUBEVAL_URL="${KUBEVAL_RELEASES_URL}/${KUBEVAL_VERSION}/kubeval-linux-amd64.tar.gz" && \
     SOPS_URL="${SOPS_RELEASES_URL}/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux" && \
     cd /tmp && \
@@ -44,7 +38,6 @@ RUN set -x && \
     curl -sSL "$HELM3_URL" -o /tmp/helm3.tgz && \
     curl -sSL "$KUSTOMIZE_URL" -o /tmp/kustomize.tgz && \
     curl -sSL "$SEISO_URL" -o /tmp/seiso && \
-    curl -sSL "$IMAGE_CLEANUP_URL" -o /tmp/image-cleanup && \
     curl -sSL "$KUBEVAL_URL" -o /tmp/kubeval.tgz && \
     curl -sSL "$JQ_URL" -o /tmp/jq && \
     curl -sSL "$SOPS_URL" -o /bin/sops && \
@@ -53,14 +46,12 @@ RUN set -x && \
     echo "${HELM3_SHA256SUM}  /tmp/helm3.tgz" > /tmp/HELM3_CHECKSUM && \
     echo "${KUSTOMIZE_SHA256SUM}  /tmp/kustomize.tgz" > /tmp/KUSTOMIZE_CHECKSUM && \
     echo "${SEISO_SHA256SUM}  /tmp/seiso" > /tmp/SEISO_CHECKSUM && \
-    echo "${IMAGE_CLEANUP_SHA256SUM}  /tmp/image-cleanup" > /tmp/IMAGE_CLEANUP_CHECKSUM && \
     echo "${KUBEVAL_SHA256SUM}  /tmp/kubeval.tgz" > /tmp/KUBEVAL_CHECKSUM && \
     [ ! -z "$SHA256SUM" ] && sha256sum -c /tmp/CHECKSUM || echo "oc sha not checked" && \
     sha256sum -c /tmp/HELM2_CHECKSUM && \
     sha256sum -c /tmp/HELM3_CHECKSUM && \
     sha256sum -c /tmp/KUSTOMIZE_CHECKSUM && \
     sha256sum -c /tmp/SEISO_CHECKSUM && \
-    sha256sum -c /tmp/IMAGE_CLEANUP_CHECKSUM && \
     sha256sum -c /tmp/KUBEVAL_CHECKSUM && \
     tar -xzvf /tmp/oc.tgz && \
     tar -xzvf /tmp/helm2.tgz && \
@@ -70,15 +61,14 @@ RUN set -x && \
     mv -v "/tmp/linux-amd64/helm" /bin/helm3 && \
     tar -xzvf /tmp/kustomize.tgz && \
     tar -xzvf /tmp/kubeval.tgz && \
-    chmod 755 /tmp/kustomize /tmp/seiso /tmp/jq /bin/sops /tmp/image-cleanup && \
+    chmod 755 /tmp/kustomize /tmp/seiso /tmp/jq /bin/sops && \
     %%OC_TOOL_COPY_COMMAND%% && \
     mv -v "/tmp/kubeval" /bin/ && \
     mv -v "/tmp/kustomize" /bin/ && \
     mv -v "/tmp/seiso" /bin/ && \
-    mv -v "/tmp/image-cleanup" /opt/ && \
     mv -v "/tmp/jq" /bin/ && \
     ln -s /bin/oc /bin/kubectl && \
-    ln -s /opt/helm2-deprecation.sh /bin/helm && \
+    ln -s /bin/helm3 /bin/helm && \
     rm -rf /tmp/* && \
     yum install -y git gettext && \
     yum clean all -y && \

src/release.sh

@@ -67,8 +67,6 @@ seiso_version=$(curl -sS https://${api_user}api.github.com/repos/appuio/seiso/re
       '.[]| select(.prerelease|not) | .tag_name' \
   | head -n 1)
 
-image_cleanup_version=v0.3.0-rc.1 # last supported version before the breaking changes
-
 kubeval_version=$(curl -sS https://${api_user}api.github.com/repos/instrumenta/kubeval/releases \
   | jq --raw-output \
       '.[]| select(.prerelease|not) | .tag_name' \
@@ -86,10 +84,6 @@ seiso_shasum=$(curl -sSL https://github.com/appuio/seiso/releases/download/${sei
   | grep linux_amd64$ \
   | cut -f 1 -d ' ')
 
-image_cleanup_shasum=$(curl -sSL https://github.com/appuio/seiso/releases/download/${image_cleanup_version}/checksums.txt \
-  | grep linux_amd64 \
-  | cut -f 1 -d ' ')
-
 kubeval_shasum=$(curl -sSL https://github.com/instrumenta/kubeval/releases/download/${kubeval_version}/checksums.txt \
   | grep linux-amd64 \
   | cut -f 1 -d ' ')
@@ -105,7 +99,6 @@ echo "- helm2: ${helm2_version} (shasum: ${helm2_shasum})"
 echo "- helm3: ${helm3_version} (shasum: ${helm3_shasum})"
 echo "- kustomize: ${kustomize_version} (shasum: ${kustomize_shasum})"
 echo "- seiso: ${seiso_version} (shasum: ${seiso_shasum})"
-echo "- image-cleanup: ${image_cleanup_version} (shasum: ${image_cleanup_shasum})"
 echo "- kubeval: ${kubeval_version} (shasum: ${kubeval_shasum})"
 echo "- sops: ${sops_version}"
 
@@ -115,7 +108,6 @@ sed \
   -e "s/%%HELM3_VERSION%%/${helm3_version}/" \
   -e "s/%%KUSTOMIZE_VERSION%%/${kustomize_version}/" \
   -e "s/%%SEISO_VERSION%%/${seiso_version}/" \
-  -e "s/%%IMAGE_CLEANUP_VERSION%%/${image_cleanup_version}/" \
   -e "s/%%KUBEVAL_VERSION%%/${kubeval_version}/" \
   -e "s/%%SOPS_VERSION%%/${sops_version}/" \
   -e "s@%%OKD_DOWNLOAD_BASE_URL%%@${okd_download_base_url}@" \
@@ -126,8 +118,5 @@ sed \
   -e "s/%%HELM3_SHA256SUM%%/${helm3_shasum}/" \
   -e "s/%%KUSTOMIZE_SHA256SUM%%/${kustomize_shasum}/" \
   -e "s/%%SEISO_SHA256SUM%%/${seiso_shasum}/" \
-  -e "s/%%IMAGE_CLEANUP_SHA256SUM%%/${image_cleanup_shasum}/" \
   -e "s/%%KUBEVAL_SHA256SUM%%/${kubeval_shasum}/" \
-  src/Dockerfile > "${ver}/Dockerfile" && \
-cp -r src/opt "${ver}/" && \
-cp "src/image-cleanup.sh" "${ver}/"
+  src/Dockerfile > "${ver}/Dockerfile"

v3.10/Dockerfile

@@ -1,19 +1,17 @@
 FROM docker.io/library/centos:7@sha256:c2f1d5a9c0a81350fa0ad7e1eee99e379d75fe53823d44b5469eb2eb6092c941
 
 ENV VERSION=v3.10.0 \
-    HELM2_VERSION=v2.16.7 \
-    HELM3_VERSION=v3.2.1 \
-    KUSTOMIZE_VERSION=v3.5.5 \
+    HELM2_VERSION=v2.16.9 \
+    HELM3_VERSION=v3.2.4 \
+    KUSTOMIZE_VERSION=v3.6.1 \
     SEISO_VERSION=v0.6.0 \
-    IMAGE_CLEANUP_VERSION=v0.3.0-rc.1 \
     KUBEVAL_VERSION=0.15.0 \
     ARCHIVE=openshift-origin-client-tools-v3.10.0-dd10d17-linux-64bit \
     SHA256SUM=0f54235127884309d19b23e8e64e347f783efd6b5a94b49bfc4d0bf472efb5b8 \
-    HELM2_SHA256SUM=4afe48da420e4c3adcccf8484f27991834e3a3838668103199f274f4fa6f2df2 \
-    HELM3_SHA256SUM=018f9908cb950701a5d59e757653a790c66d8eda288625dbb185354ca6f41f6b \
-    KUSTOMIZE_SHA256SUM=23306e0c0fb24f5a9fea4c3b794bef39211c580e4cbaee9e21b9891cb52e73e7 \
+    HELM2_SHA256SUM=197b9338129000f5d085b37e93ae3bcdd785901356a426dfa1f948d6b7a5a744 \
+    HELM3_SHA256SUM=8eb56cbb7d0da6b73cd8884c6607982d0be8087027b8ded01d6b2759a72e34b1 \
+    KUSTOMIZE_SHA256SUM=0aeca6a054183bd8e7c29307875c8162aba6d2d4e170d3e7751aa78660237126 \
     SEISO_SHA256SUM=166a2af99647778de0d64b16441a72a947e7972f65b6064fbfdbc423f7c75369 \
-    IMAGE_CLEANUP_SHA256SUM=14f64a616f17c49008a5e66c4078e6870f07a2a6be24d8ddd932396a22ee0607 \
     KUBEVAL_SHA256SUM=70bff2642a2886c0d9ebea452ffb81f333a956e26bbe0826fd7c6797e343e5aa \
     SOPS_VERSION=v3.5.0 \
     SOPS_RELEASES_URL="https://github.com/mozilla/sops/releases/download" \
@@ -26,16 +24,12 @@ ENV VERSION=v3.10.0 \
     OC_PLUGINS_REPO="https://github.com/appuio/oc-plugins" \
     KUBECTL_PLUGINS_PATH="/opt/kube/plugins"
 
-COPY opt/helm2-deprecation.sh /opt/
-COPY image-cleanup.sh /bin/image-cleanup
-
 RUN set -x && \
     URL="${OKD_DOWNLOAD_BASE_URL}/${VERSION}/${ARCHIVE}.tar.gz" && \
     HELM2_URL="${HELM_RELEASES_URL}/helm-${HELM2_VERSION}-linux-amd64.tar.gz" && \
     HELM3_URL="${HELM_RELEASES_URL}/helm-${HELM3_VERSION}-linux-amd64.tar.gz" && \
     KUSTOMIZE_URL="${KUSTOMIZE_RELEASES_URL}/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz" && \
     SEISO_URL="${SEISO_RELEASES_URL}/${SEISO_VERSION}/seiso_linux_amd64" && \
-    IMAGE_CLEANUP_URL="${SEISO_RELEASES_URL}/${IMAGE_CLEANUP_VERSION}/image-cleanup_linux_amd64" && \
     KUBEVAL_URL="${KUBEVAL_RELEASES_URL}/${KUBEVAL_VERSION}/kubeval-linux-amd64.tar.gz" && \
     SOPS_URL="${SOPS_RELEASES_URL}/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux" && \
     cd /tmp && \
@@ -44,7 +38,6 @@ RUN set -x && \
     curl -sSL "$HELM3_URL" -o /tmp/helm3.tgz && \
     curl -sSL "$KUSTOMIZE_URL" -o /tmp/kustomize.tgz && \
     curl -sSL "$SEISO_URL" -o /tmp/seiso && \
-    curl -sSL "$IMAGE_CLEANUP_URL" -o /tmp/image-cleanup && \
     curl -sSL "$KUBEVAL_URL" -o /tmp/kubeval.tgz && \
     curl -sSL "$JQ_URL" -o /tmp/jq && \
     curl -sSL "$SOPS_URL" -o /bin/sops && \
@@ -53,14 +46,12 @@ RUN set -x && \
     echo "${HELM3_SHA256SUM}  /tmp/helm3.tgz" > /tmp/HELM3_CHECKSUM && \
     echo "${KUSTOMIZE_SHA256SUM}  /tmp/kustomize.tgz" > /tmp/KUSTOMIZE_CHECKSUM && \
     echo "${SEISO_SHA256SUM}  /tmp/seiso" > /tmp/SEISO_CHECKSUM && \
-    echo "${IMAGE_CLEANUP_SHA256SUM}  /tmp/image-cleanup" > /tmp/IMAGE_CLEANUP_CHECKSUM && \
     echo "${KUBEVAL_SHA256SUM}  /tmp/kubeval.tgz" > /tmp/KUBEVAL_CHECKSUM && \
     [ ! -z "$SHA256SUM" ] && sha256sum -c /tmp/CHECKSUM || echo "oc sha not checked" && \
     sha256sum -c /tmp/HELM2_CHECKSUM && \
     sha256sum -c /tmp/HELM3_CHECKSUM && \
     sha256sum -c /tmp/KUSTOMIZE_CHECKSUM && \
     sha256sum -c /tmp/SEISO_CHECKSUM && \
-    sha256sum -c /tmp/IMAGE_CLEANUP_CHECKSUM && \
     sha256sum -c /tmp/KUBEVAL_CHECKSUM && \
     tar -xzvf /tmp/oc.tgz && \
     tar -xzvf /tmp/helm2.tgz && \
@@ -70,15 +61,14 @@ RUN set -x && \
     mv -v "/tmp/linux-amd64/helm" /bin/helm3 && \
     tar -xzvf /tmp/kustomize.tgz && \
     tar -xzvf /tmp/kubeval.tgz && \
-    chmod 755 /tmp/kustomize /tmp/seiso /tmp/jq /bin/sops /tmp/image-cleanup && \
+    chmod 755 /tmp/kustomize /tmp/seiso /tmp/jq /bin/sops && \
     mv -v "/tmp/${ARCHIVE}/oc" /bin/ && \
     mv -v "/tmp/kubeval" /bin/ && \
     mv -v "/tmp/kustomize" /bin/ && \
     mv -v "/tmp/seiso" /bin/ && \
-    mv -v "/tmp/image-cleanup" /opt/ && \
     mv -v "/tmp/jq" /bin/ && \
     ln -s /bin/oc /bin/kubectl && \
-    ln -s /opt/helm2-deprecation.sh /bin/helm && \
+    ln -s /bin/helm3 /bin/helm && \
     rm -rf /tmp/* && \
     yum install -y git gettext && \
     yum clean all -y && \