Skip to content

Commit 0a26e2a

Browse files
(fix): ensure full cert-manager uninstall/teardown for e2e tests
1 parent 04eaa17 commit 0a26e2a

File tree

7 files changed

+91
-0
lines changed
  • docs/book/src
    • cronjob-tutorial/testdata/project/test/utils
    • getting-started/testdata/project/test/utils
    • multiversion-tutorial/testdata/project/test/utils
  • pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils
  • testdata

7 files changed

+91
-0
lines changed

docs/book/src/cronjob-tutorial/testdata/project/test/utils/utils.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,19 @@ func UninstallCertManager() {
111111
if _, err := Run(cmd); err != nil {
112112
warnError(err)
113113
}
114+
115+
// Delete leftover leases in kube-system (not cleaned by default)
116+
kubeSystemLeases := []string{
117+
"cert-manager-cainjector-leader-election",
118+
"cert-manager-controller",
119+
}
120+
for _, lease := range kubeSystemLeases {
121+
cmd = exec.Command("kubectl", "delete", "lease", lease,
122+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
123+
if _, err := Run(cmd); err != nil {
124+
warnError(err)
125+
}
126+
}
114127
}
115128

116129
// InstallCertManager installs the cert manager bundle.

docs/book/src/getting-started/testdata/project/test/utils/utils.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,19 @@ func UninstallCertManager() {
111111
if _, err := Run(cmd); err != nil {
112112
warnError(err)
113113
}
114+
115+
// Delete leftover leases in kube-system (not cleaned by default)
116+
kubeSystemLeases := []string{
117+
"cert-manager-cainjector-leader-election",
118+
"cert-manager-controller",
119+
}
120+
for _, lease := range kubeSystemLeases {
121+
cmd = exec.Command("kubectl", "delete", "lease", lease,
122+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
123+
if _, err := Run(cmd); err != nil {
124+
warnError(err)
125+
}
126+
}
114127
}
115128

116129
// InstallCertManager installs the cert manager bundle.

docs/book/src/multiversion-tutorial/testdata/project/test/utils/utils.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,19 @@ func UninstallCertManager() {
111111
if _, err := Run(cmd); err != nil {
112112
warnError(err)
113113
}
114+
115+
// Delete leftover leases in kube-system (not cleaned by default)
116+
kubeSystemLeases := []string{
117+
"cert-manager-cainjector-leader-election",
118+
"cert-manager-controller",
119+
}
120+
for _, lease := range kubeSystemLeases {
121+
cmd = exec.Command("kubectl", "delete", "lease", lease,
122+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
123+
if _, err := Run(cmd); err != nil {
124+
warnError(err)
125+
}
126+
}
114127
}
115128

116129
// InstallCertManager installs the cert manager bundle.

pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils/utils.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,19 @@ func UninstallCertManager() {
139139
if _, err := Run(cmd); err != nil {
140140
warnError(err)
141141
}
142+
143+
// Delete leftover leases in kube-system (not cleaned by default)
144+
kubeSystemLeases := []string{
145+
"cert-manager-cainjector-leader-election",
146+
"cert-manager-controller",
147+
}
148+
for _, lease := range kubeSystemLeases {
149+
cmd = exec.Command("kubectl", "delete", "lease", lease,
150+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
151+
if _, err := Run(cmd); err != nil {
152+
warnError(err)
153+
}
154+
}
142155
}
143156
144157
// InstallCertManager installs the cert manager bundle.

testdata/project-v4-multigroup/test/utils/utils.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,19 @@ func UninstallCertManager() {
111111
if _, err := Run(cmd); err != nil {
112112
warnError(err)
113113
}
114+
115+
// Delete leftover leases in kube-system (not cleaned by default)
116+
kubeSystemLeases := []string{
117+
"cert-manager-cainjector-leader-election",
118+
"cert-manager-controller",
119+
}
120+
for _, lease := range kubeSystemLeases {
121+
cmd = exec.Command("kubectl", "delete", "lease", lease,
122+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
123+
if _, err := Run(cmd); err != nil {
124+
warnError(err)
125+
}
126+
}
114127
}
115128

116129
// InstallCertManager installs the cert manager bundle.

testdata/project-v4-with-plugins/test/utils/utils.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,19 @@ func UninstallCertManager() {
111111
if _, err := Run(cmd); err != nil {
112112
warnError(err)
113113
}
114+
115+
// Delete leftover leases in kube-system (not cleaned by default)
116+
kubeSystemLeases := []string{
117+
"cert-manager-cainjector-leader-election",
118+
"cert-manager-controller",
119+
}
120+
for _, lease := range kubeSystemLeases {
121+
cmd = exec.Command("kubectl", "delete", "lease", lease,
122+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
123+
if _, err := Run(cmd); err != nil {
124+
warnError(err)
125+
}
126+
}
114127
}
115128

116129
// InstallCertManager installs the cert manager bundle.

testdata/project-v4/test/utils/utils.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,19 @@ func UninstallCertManager() {
111111
if _, err := Run(cmd); err != nil {
112112
warnError(err)
113113
}
114+
115+
// Delete leftover leases in kube-system (not cleaned by default)
116+
kubeSystemLeases := []string{
117+
"cert-manager-cainjector-leader-election",
118+
"cert-manager-controller",
119+
}
120+
for _, lease := range kubeSystemLeases {
121+
cmd = exec.Command("kubectl", "delete", "lease", lease,
122+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
123+
if _, err := Run(cmd); err != nil {
124+
warnError(err)
125+
}
126+
}
114127
}
115128

116129
// InstallCertManager installs the cert manager bundle.

0 commit comments

Comments
 (0)