deps: fix upstream JSON patch issues (#3936) (#3940)

*: bump k8s versions to v1.18.8 and helm to v3.3.4

Signed-off-by: Maartje Eyskens <maartje@eyskens.me>

Co-authored-by: Maartje Eyskens <maartje@eyskens.me>

changelog/fragments/helm-json-patch-bug.yaml

@@ -0,0 +1,5 @@
+entries:
+  - description: >
+      Bumped helm and k8s dependencies to v3.3.4 and v1.18.8
+      to fix [this upstream bug](https://github.com/kubernetes/kubernetes/issues/91615)
+    kind: bugfix

go.mod

@@ -24,29 +24,29 @@ require (
 	github.com/prometheus/common v0.9.1
 	github.com/rogpeppe/go-internal v1.5.0
 	github.com/sergi/go-diff v1.0.0
-	github.com/sirupsen/logrus v1.5.0
+	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/afero v1.2.2
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.4.0
-	github.com/stretchr/testify v1.5.1
+	github.com/stretchr/testify v1.6.1
 	go.uber.org/zap v1.14.1
 	golang.org/x/net v0.0.0-20200625001655-4c5254603344
 	golang.org/x/tools v0.0.0-20200403190813-44a64ad78b9b
 	gomodules.xyz/jsonpatch/v3 v3.0.1
 	gopkg.in/yaml.v2 v2.2.8
-	gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966
-	helm.sh/helm/v3 v3.2.4
-	k8s.io/api v0.18.2
-	k8s.io/apiextensions-apiserver v0.18.2
-	k8s.io/apimachinery v0.18.2
-	k8s.io/cli-runtime v0.18.2
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
+	helm.sh/helm/v3 v3.3.4
+	k8s.io/api v0.18.8
+	k8s.io/apiextensions-apiserver v0.18.8
+	k8s.io/apimachinery v0.18.8
+	k8s.io/cli-runtime v0.18.8
 	k8s.io/client-go v12.0.0+incompatible
-	k8s.io/code-generator v0.18.2
+	k8s.io/code-generator v0.18.8
 	k8s.io/gengo v0.0.0-20200114144118-36b2048a9120
 	k8s.io/klog v1.0.0
 	k8s.io/kube-state-metrics v1.7.2
-	k8s.io/kubectl v0.18.2
+	k8s.io/kubectl v0.18.8
 	rsc.io/letsencrypt v0.0.3 // indirect
 	sigs.k8s.io/controller-runtime v0.6.0
 	sigs.k8s.io/controller-tools v0.3.0
@@ -58,5 +58,5 @@ replace (
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
 	github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.10.0
 	golang.org/x/text => golang.org/x/text v0.3.3 // Required to fix CVE-2020-14040
-	k8s.io/client-go => k8s.io/client-go v0.18.2
+	k8s.io/client-go => k8s.io/client-go v0.18.8
 )

internal/scaffold/ansible/go_mod.go

@@ -46,7 +46,7 @@ require (
 )
 
 replace (
-	k8s.io/client-go => k8s.io/client-go v0.18.2 // Required by prometheus-operator
+	k8s.io/client-go => k8s.io/client-go v0.18.8 // Required by prometheus-operator
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
 )
 `

internal/scaffold/go_mod.go

@@ -45,7 +45,7 @@ require (
 )
 
 replace (
-	k8s.io/client-go => k8s.io/client-go v0.18.2 // Required by prometheus-operator
+	k8s.io/client-go => k8s.io/client-go v0.18.8 // Required by prometheus-operator
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
 )
 `

internal/scaffold/helm/go_mod.go

@@ -46,7 +46,7 @@ require (
 )
 
 replace (
-	k8s.io/client-go => k8s.io/client-go v0.18.2 // Required by prometheus-operator
+	k8s.io/client-go => k8s.io/client-go v0.18.8 // Required by prometheus-operator
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
 )
 `

test/test-framework/go.mod

@@ -5,15 +5,15 @@ go 1.13
 require (
 	github.com/operator-framework/operator-sdk v0.0.0
 	github.com/spf13/pflag v1.0.5
-	k8s.io/api v0.18.2
-	k8s.io/apimachinery v0.18.2
+	k8s.io/api v0.18.8
+	k8s.io/apimachinery v0.18.8
 	k8s.io/client-go v12.0.0+incompatible
 	sigs.k8s.io/controller-runtime v0.6.0
 )
 
 replace (
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
-	k8s.io/client-go => k8s.io/client-go v0.18.2 // Required by prometheus-operator
+	k8s.io/client-go => k8s.io/client-go v0.18.8 // Required by prometheus-operator
 )
 
 replace github.com/operator-framework/operator-sdk => ../../