Merge branch 'master' into chore/service_controller

.circleci/config.yml

@@ -641,7 +641,7 @@ workflows:
         # custom parameters
         use_local_kuma_images: true
     - example_minikube:
-        <<: *master_workflow_filters
+        <<: *commit_workflow_filters
         name: minikube_v1_16
         requires:
           - images
@@ -657,7 +657,7 @@ workflows:
         kubernetes_version: v1.18.16
         use_local_kuma_images: true
     - example_minikube:
-        <<: *master_workflow_filters
+        <<: *commit_workflow_filters
         name: minikube_v1_20
         requires:
           - images
@@ -862,15 +862,15 @@ workflows:
         # docker images for a release build must be downloaded from a public Docker registry
         use_local_kuma_images: false
     - example_minikube:
-        <<: *master_workflow_filters
+        <<: *release_workflow_filters
         name: minikube_v1_19
         requires:
           - release
         # custom parameters
         kubernetes_version: v1.19.8
         use_local_kuma_images: false
     - example_minikube:
-        <<: *master_workflow_filters
+        <<: *release_workflow_filters
         name: minikube_v1_20
         requires:
           - release

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/kumahq/kuma/pkg/plugins/resources/k8s/native v0.0.0-00010101000000-000000000000
 	github.com/kumahq/kuma/pkg/transparentproxy/istio v0.0.0-00010101000000-000000000000
 	github.com/lib/pq v1.9.0
-	github.com/miekg/dns v1.1.38
+	github.com/miekg/dns v1.1.39
 	github.com/onsi/ginkgo v1.15.0
 	github.com/onsi/gomega v1.10.5
 	github.com/patrickmn/go-cache v2.1.0+incompatible

go.sum

@@ -821,8 +821,8 @@ github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88J
 github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
-github.com/miekg/dns v1.1.38 h1:MtIY+fmHUVVgv1AXzmKMWcwdCYxTRPG1EDjpqF4RCEw=
-github.com/miekg/dns v1.1.38/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
+github.com/miekg/dns v1.1.39 h1:6dRfDGnHiXOMmTZkwWANy7bBXXlKls5Qu+pn+Ue0TLo=
+github.com/miekg/dns v1.1.39/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=