Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rancher/system-upgrade-controller
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.7.6
Choose a base ref
...
head repository: rancher/system-upgrade-controller
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release-0.7
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 23, 2021

  1. [backport release-0.7] avoid plan cache when handling jobs (#152) 

    Attempting to address #134

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
(cherry picked from commit 50d5e4f)
    @dweomer
    dweomer authored Sep 23, 2021
    Copy the full SHA
    1f6304f View commit details

  2. [backport release-0.7] job parallelism is zero unless in applying list ( 

    #153)

Attempting to address #134

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
(cherry picked from commit 621bcee)
    @dweomer
    dweomer authored Sep 23, 2021
    Copy the full SHA
    5285131 View commit details

Commits on Oct 4, 2021

  1. drone: bump dapper and drone plugins (#156) (#157) 

    - rancher/dapper:v0.5.0
- plugins/release:latest
- plugins/manifest:latest

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
(cherry picked from commit 5e6e996)
    @dweomer
    dweomer authored Oct 4, 2021
    Copy the full SHA
    b99b5a4 View commit details
Showing with 22 additions and 12 deletions.
  1. +8 −8 .drone.yml
  2. +1 −1 pkg/upgrade/handle_batch.go
  3. +13 −3 pkg/upgrade/job/job.go
16 changes: 8 additions & 8 deletions .drone.yml
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ platform:

steps:
- name: build
image: rancher/dapper:v0.4.2
image: rancher/dapper:v0.5.0
commands:
- dapper ci
- dapper e2e-sonobuoy
@@ -18,7 +18,7 @@ steps:
path: /var/run/docker.sock

- name: upload-artifacts
image: ibuildthecloud/github-release:v0.0.1
image: plugins/github-release
settings:
api_key:
from_secret: github_token
@@ -98,15 +98,15 @@ platform:

steps:
- name: build
image: rancher/dapper:v0.4.2
image: rancher/dapper:v0.5.0
commands:
- dapper ci
volumes:
- name: docker
path: /var/run/docker.sock

- name: upload-artifacts
image: ibuildthecloud/github-release:v0.0.1
image: plugins/github-release
settings:
api_key:
from_secret: github_token
@@ -186,15 +186,15 @@ platform:

steps:
- name: build
image: rancher/dapper:v0.4.2
image: rancher/dapper:v0.5.0
commands:
- dapper ci
volumes:
- name: docker
path: /var/run/docker.sock

- name: upload-artifacts
image: ibuildthecloud/github-release:v0.0.1
image: plugins/github-release
settings:
api_key:
from_secret: github_token
@@ -251,7 +251,7 @@ platform:

steps:
- name: controller
image: plugins/manifest:1.0.2
image: plugins/manifest
settings:
username:
from_secret: docker_username
@@ -273,7 +273,7 @@ steps:
- tag

- name: e2e-tests
image: plugins/manifest:1.0.2
image: plugins/manifest
settings:
username:
from_secret: docker_username
2 changes: 1 addition & 1 deletion pkg/upgrade/handle_batch.go
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ func (ctl *Controller) handleJobs(ctx context.Context) error {
return obj, deleteJob(jobs, obj, metav1.DeletePropagationBackground)
}
// get the plan being applied
plan, err := plans.Cache().Get(obj.Namespace, planName)
plan, err := plans.Get(obj.Namespace, planName, metav1.GetOptions{})
switch {
case errors.IsNotFound(err):
// plan is gone, delete
16 changes: 13 additions & 3 deletions pkg/upgrade/job/job.go
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ package job

import (
"os"
"sort"
"strconv"
"strings"

@@ -22,7 +23,7 @@ const (
defaultBackoffLimit = int32(2)
defaultActiveDeadlineSeconds = int64(600)
defaultPrivileged = true
defaultKubectlImage = "rancher/kubectl:1.18.3"
defaultKubectlImage = "rancher/kubectl:v1.18.20"
defaultImagePullPolicy = corev1.PullIfNotPresent
defaultTTLSecondsAfterFinished = int32(900)
)
@@ -95,7 +96,8 @@ var (
func New(plan *upgradeapiv1.Plan, node *corev1.Node, controllerName string) *batchv1.Job {
hostPathDirectory := corev1.HostPathDirectory
labelPlanName := upgradeapi.LabelPlanName(plan.Name)
shortNodeName := strings.SplitN(upgradenode.Hostname(node), ".", 2)[0]
nodeHostname := upgradenode.Hostname(node)
shortNodeName := strings.SplitN(nodeHostname, ".", 2)[0]
job := &batchv1.Job{
ObjectMeta: metav1.ObjectMeta{
Name: name.SafeConcatName("apply", plan.Name, "on", shortNodeName, "with", plan.Status.LatestHash),
@@ -138,7 +140,7 @@ func New(plan *upgradeapiv1.Plan, node *corev1.Node, controllerName string) *bat
Key: corev1.LabelHostname,
Operator: corev1.NodeSelectorOpIn,
Values: []string{
upgradenode.Hostname(node),
nodeHostname,
},
}},
}},
@@ -186,8 +188,16 @@ func New(plan *upgradeapiv1.Plan, node *corev1.Node, controllerName string) *bat
}},
},
},
Completions: new(int32),
Parallelism: new(int32),
},
}

*job.Spec.Completions = 1
if i := sort.SearchStrings(plan.Status.Applying, nodeHostname); i < len(plan.Status.Applying) && plan.Status.Applying[i] == nodeHostname {
*job.Spec.Parallelism = 1
}

podTemplate := &job.Spec.Template
// setup secrets volumes
for _, secret := range plan.Spec.Secrets {