Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1817028: *: add an init container to stop the pod with bad revision #284

Merged
merged 2 commits into from
Apr 7, 2020
Merged

Bug 1817028: *: add an init container to stop the pod with bad revision #284

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38602d9
add an init container to stop the pod with bad revision
alaypatel07 Mar 26, 2020
52e4742
add checks for the value of generated env vars
alaypatel07 Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions bindata/etcd/pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,29 @@ metadata:
revision: "REVISION"
spec:
initContainers:
- name: etcd-ensure-env-vars
image: ${IMAGE}
imagePullPolicy: IfNotPresent
terminationMessagePolicy: FallbackToLogsOnError
command:
- /bin/sh
- -c
- |
#!/bin/sh
set -euo pipefail

: "${NODE_NODE_ENVVAR_NAME_ETCD_URL_HOST?not set}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't read this. I expected to see a downward API injection of IP address and then a bash comparison between the computed IP and the downward API IP.

: "${NODE_NODE_ENVVAR_NAME_ETCD_NAME?not set}"
: "${NODE_NODE_ENVVAR_NAME_IP?not set}"

resources:
requests:
memory: 60Mi
cpu: 30m
securityContext:
privileged: true
env:
${COMPUTED_ENV_VARS}
- name: etcd-resources-copy
image: ${IMAGE}
imagePullPolicy: IfNotPresent
Expand Down
8 changes: 5 additions & 3 deletions pkg/operator/clustermembercontroller/clustermembercontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,17 @@ func (c *ClusterMemberController) getEtcdPodToAddToMembership() (*corev1.Pod, er
if strings.HasPrefix(pod.Name, "etcd-member") {
continue
}
ready := false
isEtcdContainerRunning, isEtcdContainerReady := false, false
for _, containerStatus := range pod.Status.ContainerStatuses {
if containerStatus.Name != "etcd" {
continue
}
ready = containerStatus.Ready
// set running and ready flags
isEtcdContainerRunning = containerStatus.State.Running != nil
isEtcdContainerReady = containerStatus.Ready
break
}
if ready {
if !isEtcdContainerRunning || isEtcdContainerReady {
continue
}

Expand Down
235 changes: 235 additions & 0 deletions pkg/operator/clustermembercontroller/clustermembercontroller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,24 @@ func TestClusterMemberController_getEtcdPodToAddToMembership(t *testing.T) {
},
Status: corev1.PodStatus{
Phase: "Running",
InitContainerStatuses: []corev1.ContainerStatus{
{
Name: "etcd-ensure-env",
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 0,
},
},
},
{
Name: "etcd-resources-copy",
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 0,
},
},
},
},
ContainerStatuses: []corev1.ContainerStatus{
{
Name: "etcd-member",
Expand All @@ -88,6 +106,24 @@ func TestClusterMemberController_getEtcdPodToAddToMembership(t *testing.T) {
},
Status: corev1.PodStatus{
Phase: "Running",
InitContainerStatuses: []corev1.ContainerStatus{
{
Name: "etcd-ensure-env",
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 0,
},
},
},
{
Name: "etcd-resources-copy",
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 0,
},
},
},
},
ContainerStatuses: []corev1.ContainerStatus{
{
Name: "etcd",
Expand Down Expand Up @@ -116,6 +152,205 @@ func TestClusterMemberController_getEtcdPodToAddToMembership(t *testing.T) {
},
want: nil,
},
{
name: "test pods with init container failed",
fields: fields{
etcdClient: etcdcli.NewFakeEtcdClient([]*etcdserverpb.Member{
{
Name: "etcd-a",
},
}),
podLister: &fakePodLister{fake.NewSimpleClientset(&corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
// this will be skipped
Name: "etcd-a",
Namespace: "openshift-etcd",
Labels: labels.Set{"app": "etcd"},
},
Status: corev1.PodStatus{
Phase: "Running",
InitContainerStatuses: []corev1.ContainerStatus{
{
Name: "etcd-ensure-env",
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 0,
},
},
},
{
Name: "etcd-resources-copy",
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 0,
},
},
},
},
ContainerStatuses: []corev1.ContainerStatus{
{
Name: "etcd",
Ready: true,
State: corev1.ContainerState{
Running: &corev1.ContainerStateRunning{},
},
},
},
},
},
&corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "etcd-b",
Namespace: "openshift-etcd",
Labels: labels.Set{"app": "etcd"},
},
Spec: corev1.PodSpec{
NodeName: "node-b",
},
Status: corev1.PodStatus{
Phase: "Running",
InitContainerStatuses: []corev1.ContainerStatus{
{
Name: "etcd-ensure-env",
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 1,
},
},
},
{
Name: "etcd-resources-copy",
State: corev1.ContainerState{
Terminated: nil,
},
},
},
ContainerStatuses: []corev1.ContainerStatus{
{
Name: "etcd",
Ready: true,
State: corev1.ContainerState{
Waiting: &corev1.ContainerStateWaiting{
Reason: "WaitingOnInit",
},
Running: nil,
Terminated: nil,
},
},
},
},
}), "openshift-etcd"},
},
want: nil,
},
{
name: "test pods with no container state set",
fields: fields{
etcdClient: etcdcli.NewFakeEtcdClient([]*etcdserverpb.Member{
{
Name: "etcd-a",
},
}),
podLister: &fakePodLister{fake.NewSimpleClientset(&corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
// this will be skipped
Name: "etcd-a",
Namespace: "openshift-etcd",
Labels: labels.Set{"app": "etcd"},
},
Status: corev1.PodStatus{
Phase: "Running",
InitContainerStatuses: []corev1.ContainerStatus{
{
Name: "etcd-ensure-env",
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 0,
},
},
},
{
Name: "etcd-resources-copy",
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 0,
},
},
},
},
ContainerStatuses: []corev1.ContainerStatus{
{
Name: "etcd",
},
},
},
},
&corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "etcd-b",
Namespace: "openshift-etcd",
Labels: labels.Set{"app": "etcd"},
},
Spec: corev1.PodSpec{
NodeName: "node-b",
},
Status: corev1.PodStatus{
Phase: "Running",
InitContainerStatuses: []corev1.ContainerStatus{
{
Name: "etcd-ensure-env",
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 1,
},
},
},
{
Name: "etcd-resources-copy",
State: corev1.ContainerState{
Terminated: nil,
},
},
},
ContainerStatuses: []corev1.ContainerStatus{
{
Name: "etcd",
},
},
},
}), "openshift-etcd"},
},
want: nil,
},
{
name: "test pods with no status",
fields: fields{
etcdClient: etcdcli.NewFakeEtcdClient([]*etcdserverpb.Member{
{
Name: "etcd-a",
},
}),
podLister: &fakePodLister{fake.NewSimpleClientset(&corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
// this will be skipped
Name: "etcd-a",
Namespace: "openshift-etcd",
Labels: labels.Set{"app": "etcd"},
},
},
&corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "etcd-b",
Namespace: "openshift-etcd",
Labels: labels.Set{"app": "etcd"},
},
Spec: corev1.PodSpec{
NodeName: "node-b",
},
}), "openshift-etcd"},
},
want: nil,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down
23 changes: 23 additions & 0 deletions pkg/operator/etcd_assets/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.