diff --git a/cluster/reconcile.go b/cluster/reconcile.go index 15412a85..3a382a0d 100644 --- a/cluster/reconcile.go +++ b/cluster/reconcile.go @@ -107,15 +107,6 @@ func reconcileControl(ctx context.Context, currentCluster, kubeCluster *Cluster, if err := rebuildLocalAdminConfig(ctx, kubeCluster); err != nil { return err } - // Rolling update on change for nginx Proxy - cpChanged := hosts.IsHostListChanged(currentCluster.ControlPlaneHosts, kubeCluster.ControlPlaneHosts) - if cpChanged { - log.Infof(ctx, "[reconcile] Rolling update nginx hosts with new list of control plane hosts") - err := services.RollingUpdateNginxProxy(ctx, kubeCluster.ControlPlaneHosts, kubeCluster.WorkerHosts, currentCluster.SystemImages.NginxProxy, kubeCluster.PrivateRegistriesMap) - if err != nil { - return fmt.Errorf("Failed to rolling update Nginx hosts with new control plane hosts") - } - } // attempt to remove unschedulable taint toAddHosts := hosts.GetToAddHosts(currentCluster.ControlPlaneHosts, kubeCluster.ControlPlaneHosts) for _, host := range toAddHosts { diff --git a/docker/docker.go b/docker/docker.go index 7ffb2c12..1a29602c 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -293,7 +293,9 @@ func IsContainerUpgradable(ctx context.Context, dClient *client.Client, imageCfg if err != nil { return false, err } - if containerInspect.Config.Image != imageCfg.Image || !reflect.DeepEqual(containerInspect.Config.Cmd, imageCfg.Cmd) { + if containerInspect.Config.Image != imageCfg.Image || + !reflect.DeepEqual(containerInspect.Config.Cmd, imageCfg.Cmd) || + !reflect.DeepEqual(containerInspect.Config.Env, imageCfg.Env) { logrus.Debugf("[%s] Container [%s] is eligible for updgrade on host [%s]", plane, containerName, hostname) return true, nil }