From 86bf5c69a0efe5f7d22a2a58ccf435b0312c2e80 Mon Sep 17 00:00:00 2001 From: Peter Bittner Date: Fri, 24 Jul 2020 00:52:54 +0200 Subject: [PATCH] Upgrade Kustomize to v3.8.1, SOPS to v3.6.0 Kustomize is reported to have a new `--from-file` option of the `edit` command SOPS has new `--recursive` and `--omit-extensions` flags https://github.com/kubernetes-sigs/kustomize/issues/189#issuecomment-663124335 --- v3.10/Dockerfile | 6 +++--- v3.11/Dockerfile | 6 +++--- v3.6/Dockerfile | 6 +++--- v3.7/Dockerfile | 6 +++--- v3.9/Dockerfile | 6 +++--- v4.1/Dockerfile | 6 +++--- v4.2/Dockerfile | 6 +++--- v4.3/Dockerfile | 6 +++--- v4.4/Dockerfile | 6 +++--- v4.5/Dockerfile | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/v3.10/Dockerfile b/v3.10/Dockerfile index c481cd6..7faa805 100644 --- a/v3.10/Dockerfile +++ b/v3.10/Dockerfile @@ -3,17 +3,17 @@ FROM docker.io/library/centos:7@sha256:c2f1d5a9c0a81350fa0ad7e1eee99e379d75fe538 ENV VERSION=v3.10.0 \ HELM2_VERSION=v2.16.9 \ HELM3_VERSION=v3.2.4 \ - KUSTOMIZE_VERSION=v3.6.1 \ + KUSTOMIZE_VERSION=v3.8.1 \ SEISO_VERSION=v0.6.0 \ KUBEVAL_VERSION=0.15.0 \ ARCHIVE=openshift-origin-client-tools-v3.10.0-dd10d17-linux-64bit \ SHA256SUM=0f54235127884309d19b23e8e64e347f783efd6b5a94b49bfc4d0bf472efb5b8 \ HELM2_SHA256SUM=197b9338129000f5d085b37e93ae3bcdd785901356a426dfa1f948d6b7a5a744 \ HELM3_SHA256SUM=8eb56cbb7d0da6b73cd8884c6607982d0be8087027b8ded01d6b2759a72e34b1 \ - KUSTOMIZE_SHA256SUM=0aeca6a054183bd8e7c29307875c8162aba6d2d4e170d3e7751aa78660237126 \ + KUSTOMIZE_SHA256SUM=9d5b68f881ba89146678a0399469db24670cba4813e0299b47cb39a240006f37 \ SEISO_SHA256SUM=166a2af99647778de0d64b16441a72a947e7972f65b6064fbfdbc423f7c75369 \ KUBEVAL_SHA256SUM=70bff2642a2886c0d9ebea452ffb81f333a956e26bbe0826fd7c6797e343e5aa \ - SOPS_VERSION=v3.5.0 \ + SOPS_VERSION=v3.6.0 \ SOPS_RELEASES_URL="https://github.com/mozilla/sops/releases/download" \ OKD_DOWNLOAD_BASE_URL="https://github.com/openshift/origin/releases/download" \ HELM_RELEASES_URL="https://get.helm.sh" \ diff --git a/v3.11/Dockerfile b/v3.11/Dockerfile index 0fdd794..ff2d7dc 100644 --- a/v3.11/Dockerfile +++ b/v3.11/Dockerfile @@ -3,17 +3,17 @@ FROM docker.io/library/centos:7@sha256:c2f1d5a9c0a81350fa0ad7e1eee99e379d75fe538 ENV VERSION=v3.11.0 \ HELM2_VERSION=v2.16.9 \ HELM3_VERSION=v3.2.4 \ - KUSTOMIZE_VERSION=v3.6.1 \ + KUSTOMIZE_VERSION=v3.8.1 \ SEISO_VERSION=v0.6.0 \ KUBEVAL_VERSION=0.15.0 \ ARCHIVE=openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit \ SHA256SUM=4b0f07428ba854174c58d2e38287e5402964c9a9355f6c359d1242efd0990da3 \ HELM2_SHA256SUM=197b9338129000f5d085b37e93ae3bcdd785901356a426dfa1f948d6b7a5a744 \ HELM3_SHA256SUM=8eb56cbb7d0da6b73cd8884c6607982d0be8087027b8ded01d6b2759a72e34b1 \ - KUSTOMIZE_SHA256SUM=0aeca6a054183bd8e7c29307875c8162aba6d2d4e170d3e7751aa78660237126 \ + KUSTOMIZE_SHA256SUM=9d5b68f881ba89146678a0399469db24670cba4813e0299b47cb39a240006f37 \ SEISO_SHA256SUM=166a2af99647778de0d64b16441a72a947e7972f65b6064fbfdbc423f7c75369 \ KUBEVAL_SHA256SUM=70bff2642a2886c0d9ebea452ffb81f333a956e26bbe0826fd7c6797e343e5aa \ - SOPS_VERSION=v3.5.0 \ + SOPS_VERSION=v3.6.0 \ SOPS_RELEASES_URL="https://github.com/mozilla/sops/releases/download" \ OKD_DOWNLOAD_BASE_URL="https://github.com/openshift/origin/releases/download" \ HELM_RELEASES_URL="https://get.helm.sh" \ diff --git a/v3.6/Dockerfile b/v3.6/Dockerfile index 5ae47c2..9a708c4 100644 --- a/v3.6/Dockerfile +++ b/v3.6/Dockerfile @@ -3,17 +3,17 @@ FROM docker.io/library/centos:7@sha256:c2f1d5a9c0a81350fa0ad7e1eee99e379d75fe538 ENV VERSION=v3.6.1 \ HELM2_VERSION=v2.16.9 \ HELM3_VERSION=v3.2.4 \ - KUSTOMIZE_VERSION=v3.6.1 \ + KUSTOMIZE_VERSION=v3.8.1 \ SEISO_VERSION=v0.6.0 \ KUBEVAL_VERSION=0.15.0 \ ARCHIVE=openshift-origin-client-tools-v3.6.1-008f2d5-linux-64bit \ SHA256SUM=922afb7a5642040ea7a6b780cd68eb1d15533b6376b503351a4c38a452338d11 \ HELM2_SHA256SUM=197b9338129000f5d085b37e93ae3bcdd785901356a426dfa1f948d6b7a5a744 \ HELM3_SHA256SUM=8eb56cbb7d0da6b73cd8884c6607982d0be8087027b8ded01d6b2759a72e34b1 \ - KUSTOMIZE_SHA256SUM=0aeca6a054183bd8e7c29307875c8162aba6d2d4e170d3e7751aa78660237126 \ + KUSTOMIZE_SHA256SUM=9d5b68f881ba89146678a0399469db24670cba4813e0299b47cb39a240006f37 \ SEISO_SHA256SUM=166a2af99647778de0d64b16441a72a947e7972f65b6064fbfdbc423f7c75369 \ KUBEVAL_SHA256SUM=70bff2642a2886c0d9ebea452ffb81f333a956e26bbe0826fd7c6797e343e5aa \ - SOPS_VERSION=v3.5.0 \ + SOPS_VERSION=v3.6.0 \ SOPS_RELEASES_URL="https://github.com/mozilla/sops/releases/download" \ OKD_DOWNLOAD_BASE_URL="https://github.com/openshift/origin/releases/download" \ HELM_RELEASES_URL="https://get.helm.sh" \ diff --git a/v3.7/Dockerfile b/v3.7/Dockerfile index 1cf76fb..7d877db 100644 --- a/v3.7/Dockerfile +++ b/v3.7/Dockerfile @@ -3,17 +3,17 @@ FROM docker.io/library/centos:7@sha256:c2f1d5a9c0a81350fa0ad7e1eee99e379d75fe538 ENV VERSION=v3.7.2 \ HELM2_VERSION=v2.16.9 \ HELM3_VERSION=v3.2.4 \ - KUSTOMIZE_VERSION=v3.6.1 \ + KUSTOMIZE_VERSION=v3.8.1 \ SEISO_VERSION=v0.6.0 \ KUBEVAL_VERSION=0.15.0 \ ARCHIVE=openshift-origin-client-tools-v3.7.2-282e43f-linux-64bit \ SHA256SUM=abc89f025524eb205e433622e59843b09d2304cc913534c4ed8af627da238624 \ HELM2_SHA256SUM=197b9338129000f5d085b37e93ae3bcdd785901356a426dfa1f948d6b7a5a744 \ HELM3_SHA256SUM=8eb56cbb7d0da6b73cd8884c6607982d0be8087027b8ded01d6b2759a72e34b1 \ - KUSTOMIZE_SHA256SUM=0aeca6a054183bd8e7c29307875c8162aba6d2d4e170d3e7751aa78660237126 \ + KUSTOMIZE_SHA256SUM=9d5b68f881ba89146678a0399469db24670cba4813e0299b47cb39a240006f37 \ SEISO_SHA256SUM=166a2af99647778de0d64b16441a72a947e7972f65b6064fbfdbc423f7c75369 \ KUBEVAL_SHA256SUM=70bff2642a2886c0d9ebea452ffb81f333a956e26bbe0826fd7c6797e343e5aa \ - SOPS_VERSION=v3.5.0 \ + SOPS_VERSION=v3.6.0 \ SOPS_RELEASES_URL="https://github.com/mozilla/sops/releases/download" \ OKD_DOWNLOAD_BASE_URL="https://github.com/openshift/origin/releases/download" \ HELM_RELEASES_URL="https://get.helm.sh" \ diff --git a/v3.9/Dockerfile b/v3.9/Dockerfile index 182c3a0..f25967c 100644 --- a/v3.9/Dockerfile +++ b/v3.9/Dockerfile @@ -3,17 +3,17 @@ FROM docker.io/library/centos:7@sha256:c2f1d5a9c0a81350fa0ad7e1eee99e379d75fe538 ENV VERSION=v3.9.0 \ HELM2_VERSION=v2.16.9 \ HELM3_VERSION=v3.2.4 \ - KUSTOMIZE_VERSION=v3.6.1 \ + KUSTOMIZE_VERSION=v3.8.1 \ SEISO_VERSION=v0.6.0 \ KUBEVAL_VERSION=0.15.0 \ ARCHIVE=openshift-origin-client-tools-v3.9.0-191fece-linux-64bit \ SHA256SUM=6ed2fb1579b14b4557e4450a807c97cd1b68a6c727cd1e12deedc5512907222e \ HELM2_SHA256SUM=197b9338129000f5d085b37e93ae3bcdd785901356a426dfa1f948d6b7a5a744 \ HELM3_SHA256SUM=8eb56cbb7d0da6b73cd8884c6607982d0be8087027b8ded01d6b2759a72e34b1 \ - KUSTOMIZE_SHA256SUM=0aeca6a054183bd8e7c29307875c8162aba6d2d4e170d3e7751aa78660237126 \ + KUSTOMIZE_SHA256SUM=9d5b68f881ba89146678a0399469db24670cba4813e0299b47cb39a240006f37 \ SEISO_SHA256SUM=166a2af99647778de0d64b16441a72a947e7972f65b6064fbfdbc423f7c75369 \ KUBEVAL_SHA256SUM=70bff2642a2886c0d9ebea452ffb81f333a956e26bbe0826fd7c6797e343e5aa \ - SOPS_VERSION=v3.5.0 \ + SOPS_VERSION=v3.6.0 \ SOPS_RELEASES_URL="https://github.com/mozilla/sops/releases/download" \ OKD_DOWNLOAD_BASE_URL="https://github.com/openshift/origin/releases/download" \ HELM_RELEASES_URL="https://get.helm.sh" \ diff --git a/v4.1/Dockerfile b/v4.1/Dockerfile index 8bb7f9b..013fb91 100644 --- a/v4.1/Dockerfile +++ b/v4.1/Dockerfile @@ -3,17 +3,17 @@ FROM docker.io/library/centos:7@sha256:c2f1d5a9c0a81350fa0ad7e1eee99e379d75fe538 ENV VERSION=4.1 \ HELM2_VERSION=v2.16.9 \ HELM3_VERSION=v3.2.4 \ - KUSTOMIZE_VERSION=v3.6.1 \ + KUSTOMIZE_VERSION=v3.8.1 \ SEISO_VERSION=v0.6.0 \ KUBEVAL_VERSION=0.15.0 \ ARCHIVE=linux/oc \ SHA256SUM= \ HELM2_SHA256SUM=197b9338129000f5d085b37e93ae3bcdd785901356a426dfa1f948d6b7a5a744 \ HELM3_SHA256SUM=8eb56cbb7d0da6b73cd8884c6607982d0be8087027b8ded01d6b2759a72e34b1 \ - KUSTOMIZE_SHA256SUM=0aeca6a054183bd8e7c29307875c8162aba6d2d4e170d3e7751aa78660237126 \ + KUSTOMIZE_SHA256SUM=9d5b68f881ba89146678a0399469db24670cba4813e0299b47cb39a240006f37 \ SEISO_SHA256SUM=166a2af99647778de0d64b16441a72a947e7972f65b6064fbfdbc423f7c75369 \ KUBEVAL_SHA256SUM=70bff2642a2886c0d9ebea452ffb81f333a956e26bbe0826fd7c6797e343e5aa \ - SOPS_VERSION=v3.5.0 \ + SOPS_VERSION=v3.6.0 \ SOPS_RELEASES_URL="https://github.com/mozilla/sops/releases/download" \ OKD_DOWNLOAD_BASE_URL="https://mirror.openshift.com/pub/openshift-v4/clients/oc" \ HELM_RELEASES_URL="https://get.helm.sh" \ diff --git a/v4.2/Dockerfile b/v4.2/Dockerfile index 583facb..d00cf51 100644 --- a/v4.2/Dockerfile +++ b/v4.2/Dockerfile @@ -3,17 +3,17 @@ FROM docker.io/library/centos:7@sha256:c2f1d5a9c0a81350fa0ad7e1eee99e379d75fe538 ENV VERSION=4.2 \ HELM2_VERSION=v2.16.9 \ HELM3_VERSION=v3.2.4 \ - KUSTOMIZE_VERSION=v3.6.1 \ + KUSTOMIZE_VERSION=v3.8.1 \ SEISO_VERSION=v0.6.0 \ KUBEVAL_VERSION=0.15.0 \ ARCHIVE=linux/oc \ SHA256SUM= \ HELM2_SHA256SUM=197b9338129000f5d085b37e93ae3bcdd785901356a426dfa1f948d6b7a5a744 \ HELM3_SHA256SUM=8eb56cbb7d0da6b73cd8884c6607982d0be8087027b8ded01d6b2759a72e34b1 \ - KUSTOMIZE_SHA256SUM=0aeca6a054183bd8e7c29307875c8162aba6d2d4e170d3e7751aa78660237126 \ + KUSTOMIZE_SHA256SUM=9d5b68f881ba89146678a0399469db24670cba4813e0299b47cb39a240006f37 \ SEISO_SHA256SUM=166a2af99647778de0d64b16441a72a947e7972f65b6064fbfdbc423f7c75369 \ KUBEVAL_SHA256SUM=70bff2642a2886c0d9ebea452ffb81f333a956e26bbe0826fd7c6797e343e5aa \ - SOPS_VERSION=v3.5.0 \ + SOPS_VERSION=v3.6.0 \ SOPS_RELEASES_URL="https://github.com/mozilla/sops/releases/download" \ OKD_DOWNLOAD_BASE_URL="https://mirror.openshift.com/pub/openshift-v4/clients/oc" \ HELM_RELEASES_URL="https://get.helm.sh" \ diff --git a/v4.3/Dockerfile b/v4.3/Dockerfile index a3b7a69..401e955 100644 --- a/v4.3/Dockerfile +++ b/v4.3/Dockerfile @@ -3,17 +3,17 @@ FROM docker.io/library/centos:7@sha256:c2f1d5a9c0a81350fa0ad7e1eee99e379d75fe538 ENV VERSION=4.3 \ HELM2_VERSION=v2.16.9 \ HELM3_VERSION=v3.2.4 \ - KUSTOMIZE_VERSION=v3.6.1 \ + KUSTOMIZE_VERSION=v3.8.1 \ SEISO_VERSION=v0.6.0 \ KUBEVAL_VERSION=0.15.0 \ ARCHIVE=linux/oc \ SHA256SUM= \ HELM2_SHA256SUM=197b9338129000f5d085b37e93ae3bcdd785901356a426dfa1f948d6b7a5a744 \ HELM3_SHA256SUM=8eb56cbb7d0da6b73cd8884c6607982d0be8087027b8ded01d6b2759a72e34b1 \ - KUSTOMIZE_SHA256SUM=0aeca6a054183bd8e7c29307875c8162aba6d2d4e170d3e7751aa78660237126 \ + KUSTOMIZE_SHA256SUM=9d5b68f881ba89146678a0399469db24670cba4813e0299b47cb39a240006f37 \ SEISO_SHA256SUM=166a2af99647778de0d64b16441a72a947e7972f65b6064fbfdbc423f7c75369 \ KUBEVAL_SHA256SUM=70bff2642a2886c0d9ebea452ffb81f333a956e26bbe0826fd7c6797e343e5aa \ - SOPS_VERSION=v3.5.0 \ + SOPS_VERSION=v3.6.0 \ SOPS_RELEASES_URL="https://github.com/mozilla/sops/releases/download" \ OKD_DOWNLOAD_BASE_URL="https://mirror.openshift.com/pub/openshift-v4/clients/oc" \ HELM_RELEASES_URL="https://get.helm.sh" \ diff --git a/v4.4/Dockerfile b/v4.4/Dockerfile index b17fd1f..a572d16 100644 --- a/v4.4/Dockerfile +++ b/v4.4/Dockerfile @@ -3,17 +3,17 @@ FROM docker.io/library/centos:7@sha256:c2f1d5a9c0a81350fa0ad7e1eee99e379d75fe538 ENV VERSION=4.4 \ HELM2_VERSION=v2.16.9 \ HELM3_VERSION=v3.2.4 \ - KUSTOMIZE_VERSION=v3.6.1 \ + KUSTOMIZE_VERSION=v3.8.1 \ SEISO_VERSION=v0.6.0 \ KUBEVAL_VERSION=0.15.0 \ ARCHIVE=linux/oc \ SHA256SUM= \ HELM2_SHA256SUM=197b9338129000f5d085b37e93ae3bcdd785901356a426dfa1f948d6b7a5a744 \ HELM3_SHA256SUM=8eb56cbb7d0da6b73cd8884c6607982d0be8087027b8ded01d6b2759a72e34b1 \ - KUSTOMIZE_SHA256SUM=0aeca6a054183bd8e7c29307875c8162aba6d2d4e170d3e7751aa78660237126 \ + KUSTOMIZE_SHA256SUM=9d5b68f881ba89146678a0399469db24670cba4813e0299b47cb39a240006f37 \ SEISO_SHA256SUM=166a2af99647778de0d64b16441a72a947e7972f65b6064fbfdbc423f7c75369 \ KUBEVAL_SHA256SUM=70bff2642a2886c0d9ebea452ffb81f333a956e26bbe0826fd7c6797e343e5aa \ - SOPS_VERSION=v3.5.0 \ + SOPS_VERSION=v3.6.0 \ SOPS_RELEASES_URL="https://github.com/mozilla/sops/releases/download" \ OKD_DOWNLOAD_BASE_URL="https://mirror.openshift.com/pub/openshift-v4/clients/oc" \ HELM_RELEASES_URL="https://get.helm.sh" \ diff --git a/v4.5/Dockerfile b/v4.5/Dockerfile index 3f39351..583a01b 100644 --- a/v4.5/Dockerfile +++ b/v4.5/Dockerfile @@ -3,17 +3,17 @@ FROM docker.io/library/centos:7@sha256:c2f1d5a9c0a81350fa0ad7e1eee99e379d75fe538 ENV VERSION=4.5 \ HELM2_VERSION=v2.16.9 \ HELM3_VERSION=v3.2.4 \ - KUSTOMIZE_VERSION=v3.6.1 \ + KUSTOMIZE_VERSION=v3.8.1 \ SEISO_VERSION=v0.6.0 \ KUBEVAL_VERSION=0.15.0 \ ARCHIVE=linux/oc \ SHA256SUM= \ HELM2_SHA256SUM=197b9338129000f5d085b37e93ae3bcdd785901356a426dfa1f948d6b7a5a744 \ HELM3_SHA256SUM=8eb56cbb7d0da6b73cd8884c6607982d0be8087027b8ded01d6b2759a72e34b1 \ - KUSTOMIZE_SHA256SUM=0aeca6a054183bd8e7c29307875c8162aba6d2d4e170d3e7751aa78660237126 \ + KUSTOMIZE_SHA256SUM=9d5b68f881ba89146678a0399469db24670cba4813e0299b47cb39a240006f37 \ SEISO_SHA256SUM=166a2af99647778de0d64b16441a72a947e7972f65b6064fbfdbc423f7c75369 \ KUBEVAL_SHA256SUM=70bff2642a2886c0d9ebea452ffb81f333a956e26bbe0826fd7c6797e343e5aa \ - SOPS_VERSION=v3.5.0 \ + SOPS_VERSION=v3.6.0 \ SOPS_RELEASES_URL="https://github.com/mozilla/sops/releases/download" \ OKD_DOWNLOAD_BASE_URL="https://mirror.openshift.com/pub/openshift-v4/clients/oc" \ HELM_RELEASES_URL="https://get.helm.sh" \