From ae16621f601648a094e5f6daf80a59cf1dd3ce55 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Fri, 25 Mar 2022 11:02:34 +0100 Subject: [PATCH] Update Kustomize to v4.5.3 Signed-off-by: Hidde Beydals --- go.mod | 34 +++++++++++++++++----------------- go.sum | 8 ++++---- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 20f6bbd5..688f2087 100644 --- a/go.mod +++ b/go.mod @@ -36,11 +36,26 @@ require ( k8s.io/client-go v0.23.4 sigs.k8s.io/cli-utils v0.29.3 sigs.k8s.io/controller-runtime v0.11.1 - sigs.k8s.io/kustomize/api v0.11.2 - sigs.k8s.io/kustomize/kyaml v0.13.3 + sigs.k8s.io/kustomize/api v0.11.3 + sigs.k8s.io/kustomize/kyaml v0.13.4 sigs.k8s.io/yaml v1.3.0 ) +// Pin kustomize to v4.5.3 +replace ( + sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.11.3 + sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.4 +) + +// Fix CVE-2021-30465 +// Fix CVE-2021-43784 +// Fix GO-2021-0085 +// Fix GO-2021-0087 +replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.3 + +// Fix CVE-2021-41190 +replace github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2 + require ( cloud.google.com/go v0.99.0 // indirect github.com/Azure/azure-sdk-for-go v31.2.0+incompatible // indirect @@ -193,18 +208,3 @@ require ( sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect ) - -// pin kustomize to v4.5.2 -replace ( - sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.10.1 - sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.0 -) - -// Fix CVE-2021-30465 -// Fix CVE-2021-43784 -// Fix GO-2021-0085 -// Fix GO-2021-0087 -replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.3 - -// Fix CVE-2021-41190 -replace github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2 diff --git a/go.sum b/go.sum index 3d6478fc..398bc29c 100644 --- a/go.sum +++ b/go.sum @@ -1489,12 +1489,12 @@ sigs.k8s.io/controller-runtime v0.11.1/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eM sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= -sigs.k8s.io/kustomize/api v0.10.1 h1:KgU7hfYoscuqag84kxtzKdEC3mKMb99DPI3a0eaV1d0= -sigs.k8s.io/kustomize/api v0.10.1/go.mod h1:2FigT1QN6xKdcnGS2Ppp1uIWrtWN28Ms8A3OZUZhwr8= +sigs.k8s.io/kustomize/api v0.11.3 h1:zSfqBnm2eWKtBt1bJdeb8vdFn6RCACjkJBJXD4ewT2A= +sigs.k8s.io/kustomize/api v0.11.3/go.mod h1:+pqeIrqlbShZpegTsFiJtZ6aI8awf8D+9CeO7k7iSFQ= sigs.k8s.io/kustomize/cmd/config v0.10.2/go.mod h1:K2aW7nXJ0AaT+VA/eO0/dzFLxmpFcTzudmAgDwPY1HQ= sigs.k8s.io/kustomize/kustomize/v4 v4.4.1/go.mod h1:qOKJMMz2mBP+vcS7vK+mNz4HBLjaQSWRY22EF6Tb7Io= -sigs.k8s.io/kustomize/kyaml v0.13.0 h1:9c+ETyNfSrVhxvphs+K2dzT3dh5oVPPEqPOE/cUpScY= -sigs.k8s.io/kustomize/kyaml v0.13.0/go.mod h1:FTJxEZ86ScK184NpGSAQcfEqee0nul8oLCK30D47m4E= +sigs.k8s.io/kustomize/kyaml v0.13.4 h1:UP4niyzHP8yBDZTJu3OyZMCbJUfT6PIj0fJZFcn8gQw= +sigs.k8s.io/kustomize/kyaml v0.13.4/go.mod h1:/ya3Gk4diiQzlE4mBh7wykyLRFZNvqlbh+JnwQ9Vhrc= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=