* remove 4.3 tolerations

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
openshift · Oct 21, 2020 · a7c9d1f · a7c9d1f
1 parent b7c6982
commit a7c9d1f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 167 deletions.
diff --git a/bindata/bootkube/bootstrap-manifests/etcd-member-pod.yaml b/bindata/bootkube/bootstrap-manifests/etcd-member-pod.yaml
@@ -7,7 +7,7 @@ metadata:
     k8s-app: etcd
 spec:
   containers:
-  - name: etcd-member
+  - name: etcd
     image: {{ .Images.Etcd }}
     command:
     - /bin/sh

diff --git a/bindata/etcd/pod.yaml b/bindata/etcd/pod.yaml
@@ -62,8 +62,6 @@ ${COMPUTED_ENV_VARS}
           #!/bin/sh
           set -euo pipefail
 
-          cp /etc/kubernetes/static-pod-certs/secrets/etcd-all-peer/etcd-peer-NODE_NAME.crt /etc/kubernetes/etcd-backup-dir/system:etcd-peer-NODE_NAME.crt
-          cp /etc/kubernetes/static-pod-certs/secrets/etcd-all-peer/etcd-peer-NODE_NAME.key /etc/kubernetes/etcd-backup-dir/system:etcd-peer-NODE_NAME.key
           rm -f $(grep -l '^### Created by cluster-etcd-operator' /usr/local/bin/*)
           cp -p /etc/kubernetes/static-pod-certs/configmaps/etcd-scripts/*.sh /usr/local/bin
 
@@ -74,8 +72,6 @@ ${COMPUTED_ENV_VARS}
       securityContext:
         privileged: true
       volumeMounts:
-        - mountPath: /etc/kubernetes/etcd-backup-dir
-          name: etcd-backup-dir
         - mountPath: /etc/kubernetes/static-pod-resources
           name: resource-dir
         - mountPath: /etc/kubernetes/static-pod-certs
@@ -100,8 +96,6 @@ ${COMPUTED_ENV_VARS}
     volumeMounts:
       - mountPath: /etc/kubernetes/manifests
         name: static-pod-dir
-      - mountPath: /etc/kubernetes/etcd-backup-dir
-        name: etcd-backup-dir
       - mountPath: /etc/kubernetes/static-pod-resources
         name: resource-dir
       - mountPath: /etc/kubernetes/static-pod-certs
@@ -135,10 +129,6 @@ ${COMPUTED_ENV_VARS}
           --target-name=NODE_NAME)
          export ETCD_INITIAL_CLUSTER
 
-        # at this point we know this member is added.  To support a transition, we must remove the old etcd pod.
-        # move it somewhere safe so we can retrieve it again later if something goes badly.
-        mv /etc/kubernetes/manifests/etcd-member.yaml /etc/kubernetes/etcd-backup-dir || true
-
         # we cannot use the "normal" port conflict initcontainer because when we upgrade, the existing static pod will never yield,
         # so we do the detection in etcd container itsefl.
         echo -n "Waiting for ports 2379, 2380 and 9978 to be released."
@@ -165,7 +155,7 @@ ${COMPUTED_ENV_VARS}
           --advertise-client-urls=https://${NODE_NODE_ENVVAR_NAME_IP}:2379 \
           --listen-client-urls=https://${LISTEN_ON_ALL_IPS}:2379 \
           --listen-peer-urls=https://${LISTEN_ON_ALL_IPS}:2380 \
-          --listen-metrics-urls=https://${LISTEN_ON_ALL_IPS}:9978 ||  mv /etc/kubernetes/etcd-backup-dir/etcd-member.yaml /etc/kubernetes/manifests
+          --listen-metrics-urls=https://${LISTEN_ON_ALL_IPS}:9978
     env:
 ${COMPUTED_ENV_VARS}
     resources:
@@ -188,8 +178,6 @@ ${COMPUTED_ENV_VARS}
     volumeMounts:
       - mountPath: /etc/kubernetes/manifests
         name: static-pod-dir
-      - mountPath: /etc/kubernetes/etcd-backup-dir
-        name: etcd-backup-dir
       - mountPath: /etc/kubernetes/static-pod-resources
         name: resource-dir
       - mountPath: /etc/kubernetes/static-pod-certs
@@ -242,9 +230,6 @@ ${COMPUTED_ENV_VARS}
     - hostPath:
         path: /etc/kubernetes/manifests
       name: static-pod-dir
-    - hostPath:
-        path: /etc/kubernetes/static-pod-resources/etcd-member
-      name: etcd-backup-dir
     - hostPath:
         path: /etc/kubernetes/static-pod-resources/etcd-pod-REVISION
       name: resource-dir

diff --git a/bindata/etcd/restore-pod.yaml b/bindata/etcd/restore-pod.yaml
@@ -75,7 +75,7 @@ spec:
           --advertise-client-urls=https://${NODE_NODE_ENVVAR_NAME_IP}:2379 \
           --listen-client-urls=https://${LISTEN_ON_ALL_IPS}:2379 \
           --listen-peer-urls=https://${LISTEN_ON_ALL_IPS}:2380 \
-          --listen-metrics-urls=https://${LISTEN_ON_ALL_IPS}:9978 ||  mv /etc/kubernetes/etcd-backup-dir/etcd-member.yaml /etc/kubernetes/manifests
+          --listen-metrics-urls=https://${LISTEN_ON_ALL_IPS}:9978
     env:
 ${COMPUTED_ENV_VARS}
     resources:
@@ -98,8 +98,6 @@ ${COMPUTED_ENV_VARS}
     volumeMounts:
       - mountPath: /etc/kubernetes/manifests
         name: static-pod-dir
-      - mountPath: /etc/kubernetes/etcd-backup-dir
-        name: etcd-backup-dir
       - mountPath: /etc/kubernetes/static-pod-certs
         name: cert-dir
       - mountPath: /var/lib/etcd/
@@ -114,9 +112,6 @@ ${COMPUTED_ENV_VARS}
     - hostPath:
         path: /etc/kubernetes/manifests
       name: static-pod-dir
-    - hostPath:
-        path: /etc/kubernetes/static-pod-resources/etcd-member
-      name: etcd-backup-dir
     - hostPath:
         path: /etc/kubernetes/static-pod-resources/etcd-certs
       name: cert-dir

diff --git a/pkg/operator/clustermembercontroller/clustermembercontroller.go b/pkg/operator/clustermembercontroller/clustermembercontroller.go
@@ -129,9 +129,6 @@ func (c *ClusterMemberController) getEtcdPodToAddToMembership() (*corev1.Pod, er
 		if !strings.HasPrefix(pod.Name, "etcd-") {
 			continue
 		}
-		if strings.HasPrefix(pod.Name, "etcd-member") {
-			continue
-		}
 		isEtcdContainerRunning, isEtcdContainerReady := false, false
 		for _, containerStatus := range pod.Status.ContainerStatuses {
 			if containerStatus.Name != "etcd" {
@@ -146,21 +143,9 @@ func (c *ClusterMemberController) getEtcdPodToAddToMembership() (*corev1.Pod, er
 			continue
 		}
 
-		// check to see if this member is updating from 4.3
-		etcdMember, err := c.etcdClient.GetMember("etcd-member-" + pod.Spec.NodeName)
-		switch {
-		case apierrors.IsNotFound(err):
-			// this is not an upgrade from 4.3
-		case err != nil:
-			return nil, err
-		default:
-			klog.V(4).Infof("skipping unready pod %q because it is already an etcd member: %#v with hostname: %s", pod.Name, etcdMember, pod.Spec.Hostname)
-			return nil, nil
-		}
-
 		// now check to see if this member is already part of the quorum.  This logically requires being able to map every
 		// type of member name we have ever created.  The most important for now is the nodeName.
-		etcdMember, err = c.etcdClient.GetMember(pod.Spec.NodeName)
+		etcdMember, err := c.etcdClient.GetMember(pod.Spec.NodeName)
 		switch {
 		case apierrors.IsNotFound(err):
 			return pod, nil

diff --git a/pkg/operator/clustermembercontroller/clustermembercontroller_test.go b/pkg/operator/clustermembercontroller/clustermembercontroller_test.go
@@ -49,112 +49,6 @@ func TestClusterMemberController_getEtcdPodToAddToMembership(t *testing.T) {
 		want    *corev1.Pod
 		wantErr bool
 	}{
-		{
-			name: "test upgrade race",
-			fields: fields{
-				etcdClient: etcdcli.NewFakeEtcdClient([]*etcdserverpb.Member{
-					{
-						Name: "etcd-member-node-a",
-					},
-					{
-						Name: "etcd-member-node-b",
-					},
-					{
-						Name: "node-c",
-					},
-				}),
-				podLister: &fakePodLister{fake.NewSimpleClientset(&corev1.Pod{
-					ObjectMeta: metav1.ObjectMeta{
-						// this will be skipped
-						Name:      "etcd-member-node-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-member",
-								Ready: true,
-							},
-						},
-					},
-				},
-					&corev1.Pod{
-						ObjectMeta: metav1.ObjectMeta{
-							Name:      "etcd-node-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: 0,
-										},
-									},
-								},
-								{
-									Name: "etcd-resources-copy",
-									State: corev1.ContainerState{
-										Terminated: &corev1.ContainerStateTerminated{
-											ExitCode: 0,
-										},
-									},
-								},
-							},
-							ContainerStatuses: []corev1.ContainerStatus{
-								{
-									Name:  "etcd",
-									Ready: false,
-								},
-							},
-						},
-					},
-					&corev1.Pod{
-						ObjectMeta: metav1.ObjectMeta{
-							// this will be skipped
-							Name:      "etcd-node-c",
-							Namespace: "openshift-etcd",
-							Labels:    labels.Set{"app": "etcd"},
-						},
-						Status: corev1.PodStatus{
-							Phase: "Running",
-							ContainerStatuses: []corev1.ContainerStatus{
-								{
-									Name:  "etcd",
-									Ready: true,
-								},
-							},
-						},
-					}), "openshift-etcd"},
-			},
-			want: nil,
-		},
 		{
 			name: "test pods with init container failed",
 			fields: fields{

diff --git a/pkg/operator/etcd_assets/bindata.go b/pkg/operator/etcd_assets/bindata.go