weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Add cluster-autoscaler.kubernetes.io/safe-to-evict

Browse Source 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
Josh Soref 2023-09-14 10:35:56 -04:00
parent a91834eec9
commit 05117f5f75
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/issuer/acme/http/pod.go
View File

@ -175,7 +175,8 @@ func (s *Solver) buildDefaultPod(ch *cmacme.Challenge) *corev1.Pod {
Namespace: ch.Namespace,
Labels: podLabels,
Annotations: map[string]string{
"sidecar.istio.io/inject": "false",
"sidecar.istio.io/inject": "false",
"cluster-autoscaler.kubernetes.io/safe-to-evict": "true",
},
OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(ch, challengeGvk)},
},

13
pkg/issuer/acme/http/pod_test.go
View File

@ -71,7 +71,8 @@ func TestEnsurePod(t *testing.T) {
Namespace: testNamespace,
Labels: podLabels(chal),
Annotations: map[string]string{
"sidecar.istio.io/inject": "false",
"sidecar.istio.io/inject": "false",
"cluster-autoscaler.kubernetes.io/safe-to-evict": "true",
},
OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(chal, challengeGvk)},
},
@ -286,8 +287,9 @@ func TestMergePodObjectMetaWithPodTemplate(t *testing.T) {
cmacme.DomainLabelKey: "44655555555",
},
Annotations: map[string]string{
"sidecar.istio.io/inject": "true",
"foo": "bar",
"sidecar.istio.io/inject": "true",
"cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
"foo": "bar",
},
},
Spec: cmacme.ACMEChallengeSolverHTTP01IngressPodSpec{
@ -320,8 +322,9 @@ func TestMergePodObjectMetaWithPodTemplate(t *testing.T) {
cmacme.SolverIdentificationLabelKey: "true",
}
resultingPod.Annotations = map[string]string{
"sidecar.istio.io/inject": "true",
"foo": "bar",
"sidecar.istio.io/inject": "true",
"cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
"foo": "bar",
}
resultingPod.Spec.NodeSelector = map[string]string{
"kubernetes.io/os": "linux",