Skip to content

Commit 10ad95e

Browse files
committed
Merge branch 'main' into issue-320
2 parents 0ce06f8 + 99bd557 commit 10ad95e

File tree

5 files changed

+8
-45
lines changed

5 files changed

+8
-45
lines changed

CONTROLLER_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.29.57
1+
1.29.58

Dockerfile

Lines changed: 0 additions & 37 deletions
This file was deleted.

doc/usage/tutorial.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ kind: AppWrapper
2323
metadata:
2424
name: stateful-set-2-replicas
2525
spec:
26-
schedSpec:
26+
schedulingSpec:
2727
minAvailable: 2
2828
resources:
2929
Items:
@@ -49,7 +49,7 @@ spec:
4949
spec:
5050
containers:
5151
- name: stateful-set-2-replicas
52-
image: k8s.gcr.io/echoserver:1.4
52+
image: kicbase/echo-server:1.0
5353
resources:
5454
requests:
5555
memory: "200Mi"
@@ -193,7 +193,7 @@ kind: AppWrapper
193193
metadata:
194194
name: deployment-2-replicas
195195
spec:
196-
schedSpec:
196+
schedulingSpec:
197197
minAvailable: 2
198198
resources:
199199
Items:
@@ -218,7 +218,7 @@ spec:
218218
spec:
219219
containers:
220220
- name: deployment-2-replicas
221-
image: k8s.gcr.io/echoserver:1.4
221+
image: kicbase/echo-server:1.0
222222
resources:
223223
limits:
224224
memory: 150Mi

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ require (
6666
go.uber.org/atomic v1.4.0 // indirect
6767
go.uber.org/multierr v1.1.0 // indirect
6868
go.uber.org/zap v1.10.0 // indirect
69-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
69+
golang.org/x/crypto v0.1.0 // indirect
7070
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
7171
golang.org/x/net v0.7.0 // indirect
7272
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,8 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U
430430
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
431431
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
432432
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
433-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
434-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
433+
golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
434+
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
435435
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
436436
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
437437
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=

0 commit comments

Comments
 (0)