Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
# We lock the versions of our controllers also
# We need to keep in sync with:
# pkg/model/components/etcdmanager/model.go
KOPS_UTILS_CP_TAG=1.32.1
KOPS_UTILS_CP_TAG=1.32.2
KOPS_UTILS_CP_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_UTILS_CP_TAG | awk '{print $$2}')
# upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=1.32.1
DNS_CONTROLLER_TAG=1.32.2
DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
# upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
KOPS_CONTROLLER_TAG=1.32.1
KOPS_CONTROLLER_TAG=1.32.2
KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
# pkg/model/components/kubeapiserver/model.go
KUBE_APISERVER_HEALTHCHECK_TAG=1.32.1
KUBE_APISERVER_HEALTHCHECK_TAG=1.32.2
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')

CGO_ENABLED=0
Expand Down
4 changes: 2 additions & 2 deletions kops-version.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ var Version = KOPS_RELEASE_VERSION

// These constants are parsed by build tooling - be careful about changing the formats
const (
KOPS_RELEASE_VERSION = "1.32.1"
KOPS_CI_VERSION = "1.32.2"
KOPS_RELEASE_VERSION = "1.32.2"
KOPS_CI_VERSION = "1.32.3"
)

// GitVersion should be replaced by the makefile
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/etcdmanager/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ spec:
emptyDir: {}
`

const kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:1.32.1"
const kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:1.32.2"

// buildPod creates the pod spec, based on the EtcdClusterSpec
func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instanceGroupName string) (*v1.Pod, error) {
Expand Down
12 changes: 6 additions & 6 deletions pkg/model/components/etcdmanager/tests/interval/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -150,7 +150,7 @@ Contents: |
- --src=/opt/etcd-v3.4.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-4-13
resources: {}
volumeMounts:
Expand All @@ -171,7 +171,7 @@ Contents: |
- --src=/opt/etcd-v3.5.21/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-5-21
resources: {}
volumeMounts:
Expand Down Expand Up @@ -256,7 +256,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -293,7 +293,7 @@ Contents: |
- --src=/opt/etcd-v3.4.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-4-13
resources: {}
volumeMounts:
Expand All @@ -314,7 +314,7 @@ Contents: |
- --src=/opt/etcd-v3.5.21/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-5-21
resources: {}
volumeMounts:
Expand Down
12 changes: 6 additions & 6 deletions pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -149,7 +149,7 @@ Contents: |
- --src=/opt/etcd-v3.4.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-4-13
resources: {}
volumeMounts:
Expand All @@ -170,7 +170,7 @@ Contents: |
- --src=/opt/etcd-v3.5.21/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-5-21
resources: {}
volumeMounts:
Expand Down Expand Up @@ -254,7 +254,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -291,7 +291,7 @@ Contents: |
- --src=/opt/etcd-v3.4.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-4-13
resources: {}
volumeMounts:
Expand All @@ -312,7 +312,7 @@ Contents: |
- --src=/opt/etcd-v3.5.21/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-5-21
resources: {}
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -152,7 +152,7 @@ Contents: |
- --src=/opt/etcd-v3.4.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-4-13
resources: {}
volumeMounts:
Expand All @@ -173,7 +173,7 @@ Contents: |
- --src=/opt/etcd-v3.5.21/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-5-21
resources: {}
volumeMounts:
Expand Down Expand Up @@ -260,7 +260,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -297,7 +297,7 @@ Contents: |
- --src=/opt/etcd-v3.4.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-4-13
resources: {}
volumeMounts:
Expand All @@ -318,7 +318,7 @@ Contents: |
- --src=/opt/etcd-v3.5.21/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-5-21
resources: {}
volumeMounts:
Expand Down
12 changes: 6 additions & 6 deletions pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -158,7 +158,7 @@ Contents: |
- --src=/opt/etcd-v3.4.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-4-13
resources: {}
volumeMounts:
Expand All @@ -179,7 +179,7 @@ Contents: |
- --src=/opt/etcd-v3.5.21/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-5-21
resources: {}
volumeMounts:
Expand Down Expand Up @@ -272,7 +272,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -309,7 +309,7 @@ Contents: |
- --src=/opt/etcd-v3.4.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-4-13
resources: {}
volumeMounts:
Expand All @@ -330,7 +330,7 @@ Contents: |
- --src=/opt/etcd-v3.5.21/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-5-21
resources: {}
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/kubeapiserver/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ kind: Pod
spec:
containers:
- name: healthcheck
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.32.1
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.32.2
livenessProbe:
httpGet:
# The sidecar serves a healthcheck on the same port,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Contents: |
- --ca-cert=/secrets/ca.crt
- --client-cert=/secrets/client.crt
- --client-key=/secrets/client.key
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.32.1
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.32.2
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down
8 changes: 4 additions & 4 deletions pkg/nodemodel/wellknownassets/kopsassets_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ func Test_BuildMirroredAsset(t *testing.T) {
{
url: "https://artifacts.k8s.io/binaries/kops/%s/linux/amd64/nodeup",
expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.32.1/linux/amd64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.32.1/nodeup-linux-amd64",
"https://artifacts.k8s.io/binaries/kops/1.32.2/linux/amd64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.32.2/nodeup-linux-amd64",
},
},
{
url: "https://artifacts.k8s.io/binaries/kops/%s/linux/arm64/nodeup",
expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.32.1/linux/arm64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.32.1/nodeup-linux-arm64",
"https://artifacts.k8s.io/binaries/kops/1.32.2/linux/arm64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.32.2/nodeup-linux-arm64",
},
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ spec:
addons:
- id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 8fb3145c06d3489e13fff9a7722c28a68e1016295426cbcd8766c94aa19a019e
manifestHash: 79019ab9e27784956ddc076153f269ab7ccf3c8be302a05e0f127798ae315917
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
Expand Down Expand Up @@ -34,7 +34,7 @@ spec:
version: 9.99.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 19b87b7edff54fc3d691c513a76edc9391c73ae8f804102c075320cf6a74063c
manifestHash: 3395f828557c5e30a09f83fe1f601c6dea755397e13fde16926250088d294ae9
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.32.1
version: v1.32.2
name: dns-controller
namespace: kube-system
spec:
Expand All @@ -24,7 +24,7 @@ spec:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
kops.k8s.io/managed-by: kops
version: v1.32.1
version: v1.32.2
spec:
affinity:
nodeAffinity:
Expand All @@ -48,7 +48,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/kops/dns-controller:1.32.1
image: registry.k8s.io/kops/dns-controller:1.32.2
name: dns-controller
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ metadata:
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.32.1
version: v1.32.2
name: kops-controller
namespace: kube-system
spec:
Expand All @@ -39,7 +39,7 @@ spec:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
kops.k8s.io/managed-by: kops
version: v1.32.1
version: v1.32.2
spec:
affinity:
nodeAffinity:
Expand All @@ -65,7 +65,7 @@ spec:
value: 127.0.0.1
- name: KOPS_RUN_TOO_NEW_VERSION
value: "1"
image: registry.k8s.io/kops/kops-controller:1.32.1
image: registry.k8s.io/kops/kops-controller:1.32.2
name: kops-controller
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -86,7 +86,7 @@ spec:
- --src=/opt/etcd-v3.4.13/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-4-13
resources: {}
volumeMounts:
Expand All @@ -107,7 +107,7 @@ spec:
- --src=/opt/etcd-v3.5.21/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.32.1
image: registry.k8s.io/kops/kops-utils-cp:1.32.2
name: init-etcd-symlinks-3-5-21
resources: {}
volumeMounts:
Expand Down
Loading
Loading