Skip to content

Commit 215d16e

Browse files
authored
Merge pull request #4949 from camilamacedo86/uninstall-cert
🐛 (go/v4)(fix): (e2e) delete CertManager leftover leases in kube-system (not cleaned by default)
2 parents 58a7cd0 + 8dc1b78 commit 215d16e

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
@@ -70,6 +70,19 @@ func UninstallCertManager() {
7070
if _, err := Run(cmd); err != nil {
7171
warnError(err)
7272
}
73+
74+
// Delete leftover leases in kube-system (not cleaned by default)
75+
kubeSystemLeases := []string{
76+
"cert-manager-cainjector-leader-election",
77+
"cert-manager-controller",
78+
}
79+
for _, lease := range kubeSystemLeases {
80+
cmd = exec.Command("kubectl", "delete", "lease", lease,
81+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
82+
if _, err := Run(cmd); err != nil {
83+
warnError(err)
84+
}
85+
}
7386
}
7487

7588
// 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
@@ -66,6 +66,19 @@ func UninstallCertManager() {
6666
if _, err := Run(cmd); err != nil {
6767
warnError(err)
6868
}
69+
70+
// Delete leftover leases in kube-system (not cleaned by default)
71+
kubeSystemLeases := []string{
72+
"cert-manager-cainjector-leader-election",
73+
"cert-manager-controller",
74+
}
75+
for _, lease := range kubeSystemLeases {
76+
cmd = exec.Command("kubectl", "delete", "lease", lease,
77+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
78+
if _, err := Run(cmd); err != nil {
79+
warnError(err)
80+
}
81+
}
6982
}
7083

7184
// 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
@@ -70,6 +70,19 @@ func UninstallCertManager() {
7070
if _, err := Run(cmd); err != nil {
7171
warnError(err)
7272
}
73+
74+
// Delete leftover leases in kube-system (not cleaned by default)
75+
kubeSystemLeases := []string{
76+
"cert-manager-cainjector-leader-election",
77+
"cert-manager-controller",
78+
}
79+
for _, lease := range kubeSystemLeases {
80+
cmd = exec.Command("kubectl", "delete", "lease", lease,
81+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
82+
if _, err := Run(cmd); err != nil {
83+
warnError(err)
84+
}
85+
}
7386
}
7487

7588
// 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
@@ -94,6 +94,19 @@ func UninstallCertManager() {
9494
if _, err := Run(cmd); err != nil {
9595
warnError(err)
9696
}
97+
98+
// Delete leftover leases in kube-system (not cleaned by default)
99+
kubeSystemLeases := []string{
100+
"cert-manager-cainjector-leader-election",
101+
"cert-manager-controller",
102+
}
103+
for _, lease := range kubeSystemLeases {
104+
cmd = exec.Command("kubectl", "delete", "lease", lease,
105+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
106+
if _, err := Run(cmd); err != nil {
107+
warnError(err)
108+
}
109+
}
97110
}
98111
99112
// 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
@@ -66,6 +66,19 @@ func UninstallCertManager() {
6666
if _, err := Run(cmd); err != nil {
6767
warnError(err)
6868
}
69+
70+
// Delete leftover leases in kube-system (not cleaned by default)
71+
kubeSystemLeases := []string{
72+
"cert-manager-cainjector-leader-election",
73+
"cert-manager-controller",
74+
}
75+
for _, lease := range kubeSystemLeases {
76+
cmd = exec.Command("kubectl", "delete", "lease", lease,
77+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
78+
if _, err := Run(cmd); err != nil {
79+
warnError(err)
80+
}
81+
}
6982
}
7083

7184
// 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
@@ -66,6 +66,19 @@ func UninstallCertManager() {
6666
if _, err := Run(cmd); err != nil {
6767
warnError(err)
6868
}
69+
70+
// Delete leftover leases in kube-system (not cleaned by default)
71+
kubeSystemLeases := []string{
72+
"cert-manager-cainjector-leader-election",
73+
"cert-manager-controller",
74+
}
75+
for _, lease := range kubeSystemLeases {
76+
cmd = exec.Command("kubectl", "delete", "lease", lease,
77+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
78+
if _, err := Run(cmd); err != nil {
79+
warnError(err)
80+
}
81+
}
6982
}
7083

7184
// 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
@@ -66,6 +66,19 @@ func UninstallCertManager() {
6666
if _, err := Run(cmd); err != nil {
6767
warnError(err)
6868
}
69+
70+
// Delete leftover leases in kube-system (not cleaned by default)
71+
kubeSystemLeases := []string{
72+
"cert-manager-cainjector-leader-election",
73+
"cert-manager-controller",
74+
}
75+
for _, lease := range kubeSystemLeases {
76+
cmd = exec.Command("kubectl", "delete", "lease", lease,
77+
"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
78+
if _, err := Run(cmd); err != nil {
79+
warnError(err)
80+
}
81+
}
6982
}
7083

7184
// InstallCertManager installs the cert manager bundle.

0 commit comments

Comments
 (0)