Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cmctl for openSUSE:Factory checked
in at 2022-06-24 08:45:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cmctl (Old)
and /work/SRC/openSUSE:Factory/.cmctl.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmctl"
Fri Jun 24 08:45:51 2022 rev:4 rq:984746 version:1.8.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/cmctl/cmctl.changes 2022-06-23
10:25:32.447822815 +0200
+++ /work/SRC/openSUSE:Factory/.cmctl.new.1548/cmctl.changes 2022-06-24
08:45:54.955179863 +0200
@@ -1,0 +2,11 @@
+Thu Jun 23 15:45:02 UTC 2022 - ka...@b1-systems.de
+
+- Update to version 1.8.2:
+ * bump base images to latest available
+ * add new _bin dir to gitignore
+ * Increase ACME client HTTP timeout to 90s
+ * Remove timeouts in ACME logging middleware
+ * Incease issuer and clusterissuer controller timeouts
+ * Set static (Cluster)Issuers timeout to 90 seconds
+
+-------------------------------------------------------------------
Old:
----
cert-manager-1.8.1.tar.gz
New:
----
cert-manager-1.8.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmctl.spec ++++++
--- /var/tmp/diff_new_pack.hZ0XkP/_old 2022-06-24 08:45:56.299181369 +0200
+++ /var/tmp/diff_new_pack.hZ0XkP/_new 2022-06-24 08:45:56.303181373 +0200
@@ -21,7 +21,7 @@
%define archive_name cert-manager
Name: cmctl
-Version: 1.8.1
+Version: 1.8.2
Release: 0
Summary: CLI tool that can help you to manage cert-manager resources
inside your cluster
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.hZ0XkP/_old 2022-06-24 08:45:56.335181409 +0200
+++ /var/tmp/diff_new_pack.hZ0XkP/_new 2022-06-24 08:45:56.335181409 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/cert-manager/cert-manager</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v1.8.1</param>
+ <param name="revision">v1.8.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
@@ -16,7 +16,7 @@
<param name="compression">gz</param>
</service>
<service name="go_modules" mode="disabled">
- <param name="archive">cert-manager-1.8.1.tar.gz</param>
+ <param name="archive">cert-manager-1.8.2.tar.gz</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.hZ0XkP/_old 2022-06-24 08:45:56.355181431 +0200
+++ /var/tmp/diff_new_pack.hZ0XkP/_new 2022-06-24 08:45:56.359181436 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/cert-manager/cert-manager</param>
- <param
name="changesrevision">4889a2f46e43e0f008487edbd323da15ce218bc7</param></service></servicedata>
+ <param
name="changesrevision">f1943433be7056804e4f628ff0d6685a132c407b</param></service></servicedata>
(No newline at EOF)
++++++ cert-manager-1.8.1.tar.gz -> cert-manager-1.8.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cert-manager-1.8.1/.gitignore
new/cert-manager-1.8.2/.gitignore
--- old/cert-manager-1.8.1/.gitignore 2022-06-14 12:49:48.000000000 +0200
+++ new/cert-manager-1.8.2/.gitignore 2022-06-23 15:57:40.000000000 +0200
@@ -16,3 +16,4 @@
bin/
user.bazelrc
*.bak
+_bin/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cert-manager-1.8.1/build/images.bzl
new/cert-manager-1.8.2/build/images.bzl
--- old/cert-manager-1.8.1/build/images.bzl 2022-06-14 12:49:48.000000000
+0200
+++ new/cert-manager-1.8.2/build/images.bzl 2022-06-23 15:57:40.000000000
+0200
@@ -23,7 +23,7 @@
name = "static_base",
registry = "gcr.io",
repository = "distroless/static",
- digest =
"sha256:49f33fac9328ac595cb74bd02e6a186414191c969de0d8be34e6307c185acb8e"
+ digest =
"sha256:3e8b85e48c98349a4b6e853c63704b3df78ba8b73279663da26f42a3472ff888"
)
# Use 'dynamic' distroless image for modified cert-manager deployments that
# are dynamically linked. (This is not the default and you probably don't
@@ -35,5 +35,5 @@
name = "dynamic_base",
registry = "gcr.io",
repository = "distroless/base",
- digest =
"sha256:26bbe93b4e3bbc4846aab153fde35885d22dc3ff22f1166eb7935717d86c5c7e"
+ digest =
"sha256:6010a285f9a871e8f1f33142d53e2ad6d9d102d647704ac191c191f5becc2516"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cert-manager-1.8.1/make/base_images.mk
new/cert-manager-1.8.2/make/base_images.mk
--- old/cert-manager-1.8.1/make/base_images.mk 2022-06-14 12:49:48.000000000
+0200
+++ new/cert-manager-1.8.2/make/base_images.mk 2022-06-23 15:57:40.000000000
+0200
@@ -1,11 +1,11 @@
# autogenerated by hack/latest-base-images.sh
-STATIC_BASE_IMAGE_amd64 :=
gcr.io/distroless/static@sha256:f4e4259820649c75fef543614974adc1dfe1c937d5c663a81b3edca5da472442
-STATIC_BASE_IMAGE_arm64 :=
gcr.io/distroless/static@sha256:6017b5802f96702dd66066a351e6e84ab003b768042d83fdbfb5a1159824425a
-STATIC_BASE_IMAGE_s390x :=
gcr.io/distroless/static@sha256:f0129be2edabccb43c31a9aa915f55af03bcb3154db4190ff572907bed45a9bf
-STATIC_BASE_IMAGE_arm :=
gcr.io/distroless/static@sha256:1579bb68474622f0bfebcb9312b4b94fe6541b801eebbbc40094b0ac1793dc16
-STATIC_BASE_IMAGE_ppc64le :=
gcr.io/distroless/static@sha256:3099fcc01428f56c2e269f0e8471fd54bab41d721694c4c8dce7b040194bd85a
-DYNAMIC_BASE_IMAGE_amd64 :=
gcr.io/distroless/base@sha256:0d7168393f3b5182e0b4573b181498ba592ab18d14f35e299c2375ead522254a
-DYNAMIC_BASE_IMAGE_arm64 :=
gcr.io/distroless/base@sha256:b1319f6ace5df31b11379550fa1e0be5e35831e6402c547b0d9a65ddd574a1ff
-DYNAMIC_BASE_IMAGE_s390x :=
gcr.io/distroless/base@sha256:d254a2e521462ded33a0549e1abd5651c62c917cadc8f3eddb0f3133713b5c6c
-DYNAMIC_BASE_IMAGE_arm :=
gcr.io/distroless/base@sha256:51f3a7eaa2dfdba8287d37f59bffa27916a8b56c7e982b0ad54772b418497b6a
-DYNAMIC_BASE_IMAGE_ppc64le :=
gcr.io/distroless/base@sha256:654e2a2edfa719a477a0b7f7ce416ea43c562d3ec1df48edf091d8376ef72664
+STATIC_BASE_IMAGE_amd64 :=
gcr.io/distroless/static@sha256:3e8b85e48c98349a4b6e853c63704b3df78ba8b73279663da26f42a3472ff888
+STATIC_BASE_IMAGE_arm64 :=
gcr.io/distroless/static@sha256:2e0a6a4351fcf0b40c7d2c8455909a5ea26f56fc39c3bd9a93bb636a038fae39
+STATIC_BASE_IMAGE_s390x :=
gcr.io/distroless/static@sha256:41119d7598327fadf59f5bb0a408e6318c351f2edc69c33e34a8829b4cf99958
+STATIC_BASE_IMAGE_arm :=
gcr.io/distroless/static@sha256:6aa6919185d0b6e895cc22d08da6d52941a84b2d9dd0de39b75bde768fbbf082
+STATIC_BASE_IMAGE_ppc64le :=
gcr.io/distroless/static@sha256:c1d4d7b74e54e7970923cb3cfd1aa695a591a054c4bbde1dd4be845f8139c97a
+DYNAMIC_BASE_IMAGE_amd64 :=
gcr.io/distroless/base@sha256:6010a285f9a871e8f1f33142d53e2ad6d9d102d647704ac191c191f5becc2516
+DYNAMIC_BASE_IMAGE_arm64 :=
gcr.io/distroless/base@sha256:2345ef1376a7bf76c770c06b5144c793be04ee0df210d0090bce44f26b573f6b
+DYNAMIC_BASE_IMAGE_s390x :=
gcr.io/distroless/base@sha256:5e5ef24c2f94a4e9117714d51ec93a83c202289a4d61a7c750aa1ad6908de00a
+DYNAMIC_BASE_IMAGE_arm :=
gcr.io/distroless/base@sha256:b574ce0d540b028649dc1c0ff2ce875b6b6f2a87c52a85084b409fa325d5ccc3
+DYNAMIC_BASE_IMAGE_ppc64le :=
gcr.io/distroless/base@sha256:22bb945b2db83a6f6bbf277b6d2d89dff89b6f5d3daed38cb53369e49b19fcda
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cert-manager-1.8.1/pkg/acme/accounts/client.go
new/cert-manager-1.8.2/pkg/acme/accounts/client.go
--- old/cert-manager-1.8.1/pkg/acme/accounts/client.go 2022-06-14
12:49:48.000000000 +0200
+++ new/cert-manager-1.8.2/pkg/acme/accounts/client.go 2022-06-23
15:57:40.000000000 +0200
@@ -32,6 +32,13 @@
"github.com/cert-manager/cert-manager/pkg/metrics"
)
+const (
+ // defaultACMEHTTPTimeout sets the default maximum time that an
individual HTTP request can take when doing ACME operations.
+ // Note that there may be other timeouts - e.g. dial timeouts or TLS
handshake timeouts - which will be smaller than this. This
+ // timeout is the overall timeout for the entire request.
+ defaultACMEHTTPTimeout = time.Second * 90
+)
+
// NewClientFunc is a function type for building a new ACME client.
type NewClientFunc func(*http.Client, cmacme.ACMEIssuer, *rsa.PrivateKey,
string) acmecl.Interface
@@ -70,6 +77,6 @@
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
},
- Timeout: time.Second * 30,
+ Timeout: defaultACMEHTTPTimeout,
})
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cert-manager-1.8.1/pkg/acme/client/middleware/logger.go
new/cert-manager-1.8.2/pkg/acme/client/middleware/logger.go
--- old/cert-manager-1.8.1/pkg/acme/client/middleware/logger.go 2022-06-14
12:49:48.000000000 +0200
+++ new/cert-manager-1.8.2/pkg/acme/client/middleware/logger.go 2022-06-23
15:57:40.000000000 +0200
@@ -18,7 +18,6 @@
import (
"context"
- "time"
"github.com/go-logr/logr"
"golang.org/x/crypto/acme"
@@ -27,10 +26,6 @@
logf "github.com/cert-manager/cert-manager/pkg/logs"
)
-const (
- timeout = time.Second * 10
-)
-
func NewLogger(baseCl client.Interface) client.Interface {
return &Logger{
baseCl: baseCl,
@@ -49,135 +44,95 @@
func (l *Logger) AuthorizeOrder(ctx context.Context, id []acme.AuthzID, opt
...acme.OrderOption) (*acme.Order, error) {
l.log.V(logf.TraceLevel).Info("Calling AuthorizeOrder")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.AuthorizeOrder(ctx, id, opt...)
}
func (l *Logger) GetOrder(ctx context.Context, url string) (*acme.Order,
error) {
l.log.V(logf.TraceLevel).Info("Calling GetOrder")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.GetOrder(ctx, url)
}
func (l *Logger) FetchCert(ctx context.Context, url string, bundle bool)
([][]byte, error) {
l.log.V(logf.TraceLevel).Info("Calling FetchCert")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.FetchCert(ctx, url, bundle)
}
func (l *Logger) ListCertAlternates(ctx context.Context, url string)
([]string, error) {
l.log.V(logf.TraceLevel).Info("Calling ListCertAlternates")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.ListCertAlternates(ctx, url)
}
func (l *Logger) WaitOrder(ctx context.Context, url string) (*acme.Order,
error) {
l.log.V(logf.TraceLevel).Info("Calling WaitOrder")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.WaitOrder(ctx, url)
}
func (l *Logger) CreateOrderCert(ctx context.Context, finalizeURL string, csr
[]byte, bundle bool) (der [][]byte, certURL string, err error) {
l.log.V(logf.TraceLevel).Info("Calling CreateOrderCert")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.CreateOrderCert(ctx, finalizeURL, csr, bundle)
}
func (l *Logger) Accept(ctx context.Context, chal *acme.Challenge)
(*acme.Challenge, error) {
l.log.V(logf.TraceLevel).Info("Calling Accept")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.Accept(ctx, chal)
}
func (l *Logger) GetChallenge(ctx context.Context, url string)
(*acme.Challenge, error) {
l.log.V(logf.TraceLevel).Info("Calling GetChallenge")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.GetChallenge(ctx, url)
}
func (l *Logger) GetAuthorization(ctx context.Context, url string)
(*acme.Authorization, error) {
l.log.V(logf.TraceLevel).Info("Calling GetAuthorization")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.GetAuthorization(ctx, url)
}
func (l *Logger) WaitAuthorization(ctx context.Context, url string)
(*acme.Authorization, error) {
l.log.V(logf.TraceLevel).Info("Calling WaitAuthorization")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.WaitAuthorization(ctx, url)
}
func (l *Logger) Register(ctx context.Context, a *acme.Account, prompt
func(tosURL string) bool) (*acme.Account, error) {
l.log.V(logf.TraceLevel).Info("Calling Register")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.Register(ctx, a, prompt)
}
func (l *Logger) GetReg(ctx context.Context, url string) (*acme.Account,
error) {
l.log.V(logf.TraceLevel).Info("Calling GetReg")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.GetReg(ctx, url)
}
func (l *Logger) HTTP01ChallengeResponse(token string) (string, error) {
l.log.V(logf.TraceLevel).Info("Calling HTTP01ChallengeResponse")
+
return l.baseCl.HTTP01ChallengeResponse(token)
}
func (l *Logger) DNS01ChallengeRecord(token string) (string, error) {
l.log.V(logf.TraceLevel).Info("Calling DNS01ChallengeRecord")
+
return l.baseCl.DNS01ChallengeRecord(token)
}
func (l *Logger) Discover(ctx context.Context) (acme.Directory, error) {
l.log.V(logf.TraceLevel).Info("Calling Discover")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.Discover(ctx)
}
func (l *Logger) UpdateReg(ctx context.Context, a *acme.Account)
(*acme.Account, error) {
l.log.V(logf.TraceLevel).Info("Calling UpdateReg")
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
-
return l.baseCl.UpdateReg(ctx, a)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cert-manager-1.8.1/pkg/controller/BUILD.bazel
new/cert-manager-1.8.2/pkg/controller/BUILD.bazel
--- old/cert-manager-1.8.1/pkg/controller/BUILD.bazel 2022-06-14
12:49:48.000000000 +0200
+++ new/cert-manager-1.8.2/pkg/controller/BUILD.bazel 2022-06-23
15:57:40.000000000 +0200
@@ -70,6 +70,7 @@
"//pkg/controller/certificates:all-srcs",
"//pkg/controller/certificatesigningrequests:all-srcs",
"//pkg/controller/clusterissuers:all-srcs",
+ "//pkg/controller/globals:all-srcs",
"//pkg/controller/issuers:all-srcs",
"//pkg/controller/test:all-srcs",
],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cert-manager-1.8.1/pkg/controller/certificates/issuing/issuing_controller.go
new/cert-manager-1.8.2/pkg/controller/certificates/issuing/issuing_controller.go
---
old/cert-manager-1.8.1/pkg/controller/certificates/issuing/issuing_controller.go
2022-06-14 12:49:48.000000000 +0200
+++
new/cert-manager-1.8.2/pkg/controller/certificates/issuing/issuing_controller.go
2022-06-23 15:57:40.000000000 +0200
@@ -157,7 +157,8 @@
}
func (c *controller) ProcessItem(ctx context.Context, key string) error {
- // Set context deadline for full sync in 10 seconds
+ // TODO: Change to globals.DefaultControllerContextTimeout as part of a
wider effort to ensure we have
+ // failsafe timeouts in every controller
ctx, cancel := context.WithTimeout(ctx, time.Second*10)
defer cancel()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cert-manager-1.8.1/pkg/controller/clusterissuers/BUILD.bazel
new/cert-manager-1.8.2/pkg/controller/clusterissuers/BUILD.bazel
--- old/cert-manager-1.8.1/pkg/controller/clusterissuers/BUILD.bazel
2022-06-14 12:49:48.000000000 +0200
+++ new/cert-manager-1.8.2/pkg/controller/clusterissuers/BUILD.bazel
2022-06-23 15:57:40.000000000 +0200
@@ -16,6 +16,7 @@
"//pkg/client/clientset/versioned:go_default_library",
"//pkg/client/listers/certmanager/v1:go_default_library",
"//pkg/controller:go_default_library",
+ "//pkg/controller/globals:go_default_library",
"//pkg/issuer:go_default_library",
"//pkg/logs:go_default_library",
"//pkg/util/feature:go_default_library",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cert-manager-1.8.1/pkg/controller/clusterissuers/sync.go
new/cert-manager-1.8.2/pkg/controller/clusterissuers/sync.go
--- old/cert-manager-1.8.1/pkg/controller/clusterissuers/sync.go
2022-06-14 12:49:48.000000000 +0200
+++ new/cert-manager-1.8.2/pkg/controller/clusterissuers/sync.go
2022-06-23 15:57:40.000000000 +0200
@@ -18,7 +18,6 @@
import (
"context"
- "time"
corev1 "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
@@ -28,6 +27,7 @@
"github.com/cert-manager/cert-manager/internal/controller/feature"
internalissuers
"github.com/cert-manager/cert-manager/internal/controller/issuers"
cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
+ "github.com/cert-manager/cert-manager/pkg/controller/globals"
logf "github.com/cert-manager/cert-manager/pkg/logs"
utilfeature "github.com/cert-manager/cert-manager/pkg/util/feature"
)
@@ -41,8 +41,7 @@
func (c *controller) Sync(ctx context.Context, iss *cmapi.ClusterIssuer) (err
error) {
log := logf.FromContext(ctx)
- // allow a maximum of 10s
- ctx, cancel := context.WithTimeout(ctx, time.Second*10)
+ ctx, cancel := context.WithTimeout(ctx,
globals.DefaultControllerContextTimeout)
defer cancel()
issuerCopy := iss.DeepCopy()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cert-manager-1.8.1/pkg/controller/globals/BUILD.bazel
new/cert-manager-1.8.2/pkg/controller/globals/BUILD.bazel
--- old/cert-manager-1.8.1/pkg/controller/globals/BUILD.bazel 1970-01-01
01:00:00.000000000 +0100
+++ new/cert-manager-1.8.2/pkg/controller/globals/BUILD.bazel 2022-06-23
15:57:40.000000000 +0200
@@ -0,0 +1,22 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+ name = "go_default_library",
+ srcs = ["timeout.go"],
+ importpath = "github.com/cert-manager/cert-manager/pkg/controller/globals",
+ visibility = ["//visibility:public"],
+)
+
+filegroup(
+ name = "package-srcs",
+ srcs = glob(["**"]),
+ tags = ["automanaged"],
+ visibility = ["//visibility:private"],
+)
+
+filegroup(
+ name = "all-srcs",
+ srcs = [":package-srcs"],
+ tags = ["automanaged"],
+ visibility = ["//visibility:public"],
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cert-manager-1.8.1/pkg/controller/globals/timeout.go
new/cert-manager-1.8.2/pkg/controller/globals/timeout.go
--- old/cert-manager-1.8.1/pkg/controller/globals/timeout.go 1970-01-01
01:00:00.000000000 +0100
+++ new/cert-manager-1.8.2/pkg/controller/globals/timeout.go 2022-06-23
15:57:40.000000000 +0200
@@ -0,0 +1,27 @@
+/*
+Copyright 2022 The cert-manager Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package globals
+
+import "time"
+
+const (
+ // DefaultControllerContextTimeout is the default maximum amount of
time which a single synchronize action in some controllers
+ // may take before the sync will be cancelled by a context timeout.
+ // This timeout might not be respected on all controllers thanks to
backwards compatibility concerns, but it's a goal to have
+ // all issuers have some default timeout which represents a default
upper bound on the time they're permitted to take.
+ DefaultControllerContextTimeout = 2 * time.Minute
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cert-manager-1.8.1/pkg/controller/issuers/BUILD.bazel
new/cert-manager-1.8.2/pkg/controller/issuers/BUILD.bazel
--- old/cert-manager-1.8.1/pkg/controller/issuers/BUILD.bazel 2022-06-14
12:49:48.000000000 +0200
+++ new/cert-manager-1.8.2/pkg/controller/issuers/BUILD.bazel 2022-06-23
15:57:40.000000000 +0200
@@ -16,6 +16,7 @@
"//pkg/client/clientset/versioned:go_default_library",
"//pkg/client/listers/certmanager/v1:go_default_library",
"//pkg/controller:go_default_library",
+ "//pkg/controller/globals:go_default_library",
"//pkg/issuer:go_default_library",
"//pkg/logs:go_default_library",
"//pkg/util/feature:go_default_library",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cert-manager-1.8.1/pkg/controller/issuers/sync.go
new/cert-manager-1.8.2/pkg/controller/issuers/sync.go
--- old/cert-manager-1.8.1/pkg/controller/issuers/sync.go 2022-06-14
12:49:48.000000000 +0200
+++ new/cert-manager-1.8.2/pkg/controller/issuers/sync.go 2022-06-23
15:57:40.000000000 +0200
@@ -18,7 +18,6 @@
import (
"context"
- "time"
corev1 "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
@@ -28,6 +27,7 @@
"github.com/cert-manager/cert-manager/internal/controller/feature"
internalissuers
"github.com/cert-manager/cert-manager/internal/controller/issuers"
cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
+ "github.com/cert-manager/cert-manager/pkg/controller/globals"
logf "github.com/cert-manager/cert-manager/pkg/logs"
utilfeature "github.com/cert-manager/cert-manager/pkg/util/feature"
)
@@ -41,8 +41,7 @@
func (c *controller) Sync(ctx context.Context, iss *cmapi.Issuer) (err error) {
log := logf.FromContext(ctx)
- // allow a maximum of 10s
- ctx, cancel := context.WithTimeout(ctx, time.Second*10)
+ ctx, cancel := context.WithTimeout(ctx,
globals.DefaultControllerContextTimeout)
defer cancel()
issuerCopy := iss.DeepCopy()
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/cmctl/vendor.tar.gz
/work/SRC/openSUSE:Factory/.cmctl.new.1548/vendor.tar.gz differ: char 5, line 1
