From d43d553474c88810eb01339e639c1f0192700482 Mon Sep 17 00:00:00 2001 From: Oliver King Date: Fri, 6 Dec 2024 15:26:39 -0500 Subject: [PATCH] bump external dns to v0.15.0 and go (#315) --- go.mod | 2 +- go.sum | 9 +++++++++ pkg/manifests/external_dns.go | 2 +- pkg/manifests/fixtures/external_dns/full.json | 4 ++-- pkg/manifests/fixtures/external_dns/no-ownership.json | 2 +- pkg/manifests/fixtures/external_dns/private.json | 2 +- .../fixtures/external_dns/short-sync-interval.json | 4 ++-- testing/e2e/go.mod | 2 +- 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index d582a655..64ce4b02 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Azure/aks-app-routing-operator -go 1.22 +go 1.22.7 require ( github.com/Azure/go-autorest/autorest v0.11.29 diff --git a/go.sum b/go.sum index b87ec042..056ad131 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,7 @@ github.com/Azure/secrets-store-csi-driver-provider-azure v1.4.1 h1:24/mZ06Uzu8Ek github.com/Azure/secrets-store-csi-driver-provider-azure v1.4.1/go.mod h1:xUXKV8vOut59vIrFhyEY+4PgiK2LXkP10BtI+2y8VXM= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= @@ -51,6 +52,7 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+ github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= @@ -72,6 +74,7 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -91,6 +94,7 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -108,7 +112,9 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= +github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/openservicemesh/osm v1.2.4 h1:WBSoLWehnxedIxXHysKOR49DQVbGLW5qBdh6UD8NAUA= github.com/openservicemesh/osm v1.2.4/go.mod h1:W8yneqtDWjI8IJPtEJBMrjftPlxrMN9/k+btlKDG62w= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -126,6 +132,7 @@ github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI= github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -146,6 +153,7 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= @@ -225,6 +233,7 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 h1:Vve/L0v7CXXuxUmaMGIEK/dEeq7uiqb5qBgQrZzIE7E= +golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/manifests/external_dns.go b/pkg/manifests/external_dns.go index 35b438f0..76c9b5ff 100644 --- a/pkg/manifests/external_dns.go +++ b/pkg/manifests/external_dns.go @@ -251,7 +251,7 @@ func newExternalDNSDeployment(conf *config.Config, externalDnsConfig *ExternalDn ServiceAccountName: externalDnsConfig.Provider.ResourceName(), Containers: []corev1.Container{*withLivenessProbeMatchingReadiness(withTypicalReadinessProbe(7979, &corev1.Container{ Name: "controller", - Image: path.Join(conf.Registry, "/oss/kubernetes/external-dns:v0.13.5-5"), + Image: path.Join(conf.Registry, "/oss/v2/kubernetes/external-dns:v0.15.0"), Args: append([]string{ "--provider=" + externalDnsConfig.Provider.String(), "--source=ingress", diff --git a/pkg/manifests/fixtures/external_dns/full.json b/pkg/manifests/fixtures/external_dns/full.json index a420d368..c2025b2c 100644 --- a/pkg/manifests/fixtures/external_dns/full.json +++ b/pkg/manifests/fixtures/external_dns/full.json @@ -162,7 +162,7 @@ "containers": [ { "name": "controller", - "image": "/oss/kubernetes/external-dns:v0.13.5-5", + "image": "/oss/v2/kubernetes/external-dns:v0.15.0", "args": [ "--provider=azure", "--source=ingress", @@ -439,7 +439,7 @@ "containers": [ { "name": "controller", - "image": "/oss/kubernetes/external-dns:v0.13.5-5", + "image": "/oss/v2/kubernetes/external-dns:v0.15.0", "args": [ "--provider=azure-private-dns", "--source=ingress", diff --git a/pkg/manifests/fixtures/external_dns/no-ownership.json b/pkg/manifests/fixtures/external_dns/no-ownership.json index ee8d69b3..c2aec9c3 100644 --- a/pkg/manifests/fixtures/external_dns/no-ownership.json +++ b/pkg/manifests/fixtures/external_dns/no-ownership.json @@ -162,7 +162,7 @@ "containers": [ { "name": "controller", - "image": "/oss/kubernetes/external-dns:v0.13.5-5", + "image": "/oss/v2/kubernetes/external-dns:v0.15.0", "args": [ "--provider=azure", "--source=ingress", diff --git a/pkg/manifests/fixtures/external_dns/private.json b/pkg/manifests/fixtures/external_dns/private.json index 254ef87a..2e7891a0 100644 --- a/pkg/manifests/fixtures/external_dns/private.json +++ b/pkg/manifests/fixtures/external_dns/private.json @@ -162,7 +162,7 @@ "containers": [ { "name": "controller", - "image": "/oss/kubernetes/external-dns:v0.13.5-5", + "image": "/oss/v2/kubernetes/external-dns:v0.15.0", "args": [ "--provider=azure-private-dns", "--source=ingress", diff --git a/pkg/manifests/fixtures/external_dns/short-sync-interval.json b/pkg/manifests/fixtures/external_dns/short-sync-interval.json index 522ffcf9..53efcdf3 100644 --- a/pkg/manifests/fixtures/external_dns/short-sync-interval.json +++ b/pkg/manifests/fixtures/external_dns/short-sync-interval.json @@ -162,7 +162,7 @@ "containers": [ { "name": "controller", - "image": "/oss/kubernetes/external-dns:v0.13.5-5", + "image": "/oss/v2/kubernetes/external-dns:v0.15.0", "args": [ "--provider=azure", "--source=ingress", @@ -439,7 +439,7 @@ "containers": [ { "name": "controller", - "image": "/oss/kubernetes/external-dns:v0.13.5-5", + "image": "/oss/v2/kubernetes/external-dns:v0.15.0", "args": [ "--provider=azure-private-dns", "--source=ingress", diff --git a/testing/e2e/go.mod b/testing/e2e/go.mod index 35889304..5bb2e6fd 100644 --- a/testing/e2e/go.mod +++ b/testing/e2e/go.mod @@ -1,6 +1,6 @@ module github.com/Azure/aks-app-routing-operator/testing/e2e -go 1.22 +go 1.22.7 require ( github.com/Azure/aks-app-routing-operator v0.0.3