Sitelet https://github.com/kubernetes/kops/pull/18634/files
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kops-version.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ func KopsVersionImageTag() string {

// These constants are parsed by build tooling - be careful about changing the formats
const (
KOPS_RELEASE_VERSION = "1.36.0"
KOPS_CI_VERSION = "1.36.1"
KOPS_RELEASE_VERSION = "1.36.1"
KOPS_CI_VERSION = "1.36.2"
)

// GitVersion should be replaced by the makefile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Contents: |
value: /tmp
- name: AWS_REGION
value: us-test-1
image: my-mirror.example.com/kops-channels:1.36.0
image: my-mirror.example.com/kops-channels:1.36.1
name: kops-channels
readinessProbe:
failureThreshold: 2
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/channels/tests/minimal/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Contents: |
value: /tmp
- name: AWS_REGION
value: us-test-1
image: registry.k8s.io/kops/channels:1.36.0
image: registry.k8s.io/kops/channels:1.36.1
name: kops-channels
readinessProbe:
failureThreshold: 2
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 @@ -125,7 +125,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -192,7 +192,7 @@ Contents: |
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -216,7 +216,7 @@ Contents: |
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down Expand Up @@ -314,7 +314,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -381,7 +381,7 @@ Contents: |
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -405,7 +405,7 @@ Contents: |
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -193,7 +193,7 @@ Contents: |
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -217,7 +217,7 @@ Contents: |
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down Expand Up @@ -315,7 +315,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -382,7 +382,7 @@ Contents: |
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -406,7 +406,7 @@ Contents: |
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-6-12
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 @@ -132,7 +132,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -199,7 +199,7 @@ Contents: |
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -223,7 +223,7 @@ Contents: |
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down Expand Up @@ -327,7 +327,7 @@ Contents: |
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -394,7 +394,7 @@ Contents: |
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -418,7 +418,7 @@ Contents: |
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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.36.0
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.36.1
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 @@ -41,13 +41,13 @@ func TestBaseURL_OverridesVersionFromKopsBaseurl(/sitelet?url=https%3A%2F%2Fgithub.com%2Fkubernetes%2Fkops%2Fpull%2F18634%2Ft%2520*testing.T) {
}{
{
name: "postsubmit URL",
kopsBaseURL: "https://storage.googleapis.com/k8s-staging-kops/kops/releases/1.35.0-beta.2+v1.36.0-384-gf369c3ab16",
expectedVersion: "1.35.0-beta.2+v1.36.0-384-gf369c3ab16",
kopsBaseURL: "https://storage.googleapis.com/k8s-staging-kops/kops/releases/1.35.0-beta.2+v1.36.1-384-gf369c3ab16",
expectedVersion: "1.35.0-beta.2+v1.36.1-384-gf369c3ab16",
},
{
name: "postsubmit URL with trailing slash",
kopsBaseURL: "https://storage.googleapis.com/k8s-staging-kops/kops/releases/1.35.0-beta.2+v1.36.0-384-gf369c3ab16/",
expectedVersion: "1.35.0-beta.2+v1.36.0-384-gf369c3ab16",
kopsBaseURL: "https://storage.googleapis.com/k8s-staging-kops/kops/releases/1.35.0-beta.2+v1.36.1-384-gf369c3ab16/",
expectedVersion: "1.35.0-beta.2+v1.36.1-384-gf369c3ab16",
},
{
name: "CI URL",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -126,7 +126,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -150,7 +150,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -126,7 +126,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -150,7 +150,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -126,7 +126,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -150,7 +150,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -126,7 +126,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -150,7 +150,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -126,7 +126,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -150,7 +150,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
- --src=/ko-app/kops-utils-cp
command:
- /ko-app/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: kops-utils-cp
resources: {}
volumeMounts:
Expand Down Expand Up @@ -126,7 +126,7 @@ spec:
- --src=/opt/etcd-v3.5.31/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-5-31
resources: {}
volumeMounts:
Expand All @@ -150,7 +150,7 @@ spec:
- --src=/opt/etcd-v3.6.12/etcdctl
command:
- /opt/kops-utils/kops-utils-cp
image: registry.k8s.io/kops/kops-utils-cp:1.36.0
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
name: init-etcd-symlinks-3-6-12
resources: {}
volumeMounts:
Expand Down
Loading
Loading