Skip to content

Commit 6f3016f

Browse files
makhovmakhov
authored
Metadata v1.10 (#1301)
Signed-off-by: makhov <[email protected]>
1 parent 09207e5 commit 6f3016f

File tree

4 files changed

+32
-47
lines changed

4 files changed

+32
-47
lines changed

‎e2e/config/aws.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,34 +38,34 @@ providers:
3838
- name: k0sproject-k0smotron
3939
type: ControlPlaneProvider
4040
versions:
41-
- name: "{go://github.com/k0sproject/k0smotron@v1.4}"
42-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.4}/control-plane-components.yaml
41+
- name: "{go://github.com/k0sproject/k0smotron@v1.7}"
42+
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.7}/control-plane-components.yaml
4343
type: url
4444
contract: v1beta1
4545
files:
4646
- sourcePath: "../../metadata.yaml"
4747
replacements:
4848
- old: "imagePullPolicy: Always"
4949
new: "imagePullPolicy: IfNotPresent"
50-
- name: "{go://github.com/k0sproject/k0smotron@v1.5}"
51-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.5}/control-plane-components.yaml
50+
- name: "{go://github.com/k0sproject/k0smotron@v1.8}"
51+
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.8}/control-plane-components.yaml
5252
type: url
5353
contract: v1beta1
5454
files:
5555
- sourcePath: "../../metadata.yaml"
5656
replacements:
5757
- old: "imagePullPolicy: Always"
5858
new: "imagePullPolicy: IfNotPresent"
59-
- name: "{go://github.com/k0sproject/k0smotron@v1.6}"
60-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.6}/control-plane-components.yaml
59+
- name: "{go://github.com/k0sproject/k0smotron@v1.9}"
60+
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.9}/control-plane-components.yaml
6161
type: url
6262
contract: v1beta1
6363
files:
6464
- sourcePath: "../../metadata.yaml"
6565
replacements:
6666
- old: "imagePullPolicy: Always"
6767
new: "imagePullPolicy: IfNotPresent"
68-
- name: v1.9.99 # potentially next release. Manifest from source files (development) are used.
68+
- name: v1.10.99 # potentially next release. Manifest from source files (development) are used.
6969
value: ../../config/default
7070
contract: v1beta1
7171
files:
@@ -78,34 +78,34 @@ providers:
7878
- name: k0sproject-k0smotron
7979
type: BootstrapProvider
8080
versions:
81-
- name: "{go://github.com/k0sproject/k0smotron@v1.4}"
82-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.4}/bootstrap-components.yaml
81+
- name: "{go://github.com/k0sproject/k0smotron@v1.7}"
82+
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.7}/bootstrap-components.yaml
8383
type: url
8484
contract: v1beta1
8585
files:
8686
- sourcePath: "../../metadata.yaml"
8787
replacements:
8888
- old: "imagePullPolicy: Always"
8989
new: "imagePullPolicy: IfNotPresent"
90-
- name: "{go://github.com/k0sproject/k0smotron@v1.5}"
91-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.5}/bootstrap-components.yaml
90+
- name: "{go://github.com/k0sproject/k0smotron@v1.8}"
91+
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.8}/bootstrap-components.yaml
9292
type: url
9393
contract: v1beta1
9494
files:
9595
- sourcePath: "../../metadata.yaml"
9696
replacements:
9797
- old: "imagePullPolicy: Always"
9898
new: "imagePullPolicy: IfNotPresent"
99-
- name: "{go://github.com/k0sproject/k0smotron@v1.6}"
100-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.6}/bootstrap-components.yaml
99+
- name: "{go://github.com/k0sproject/k0smotron@v1.9}"
100+
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.9}/bootstrap-components.yaml
101101
type: url
102102
contract: v1beta1
103103
files:
104104
- sourcePath: "../../metadata.yaml"
105105
replacements:
106106
- old: "imagePullPolicy: Always"
107107
new: "imagePullPolicy: IfNotPresent"
108-
- name: v1.9.99 # potentially next release. Manifest from source files (development) are used.
108+
- name: v1.10.99 # potentially next release. Manifest from source files (development) are used.
109109
value: ../../config/default
110110
contract: v1beta1
111111
files:

‎e2e/config/docker.yaml‎

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -44,52 +44,34 @@ providers:
4444
- name: k0sproject-k0smotron
4545
type: ControlPlaneProvider
4646
versions:
47-
- name: "{go://github.com/k0sproject/[email protected]}"
48-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/[email protected]}/control-plane-components.yaml
49-
type: url
50-
contract: v1beta1
51-
files:
52-
- sourcePath: "../../metadata.yaml"
53-
replacements:
54-
- old: "imagePullPolicy: Always"
55-
new: "imagePullPolicy: IfNotPresent"
56-
- name: "{go://github.com/k0sproject/[email protected]}"
57-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/[email protected]}/control-plane-components.yaml
58-
type: url
59-
contract: v1beta1
60-
files:
61-
- sourcePath: "../../metadata.yaml"
62-
replacements:
63-
- old: "imagePullPolicy: Always"
64-
new: "imagePullPolicy: IfNotPresent"
65-
- name: "{go://github.com/k0sproject/[email protected]}"
66-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/[email protected]}/control-plane-components.yaml
47+
- name: "{go://github.com/k0sproject/[email protected]}"
48+
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/[email protected]}/control-plane-components.yaml
6749
type: url
6850
contract: v1beta1
6951
files:
7052
- sourcePath: "../../metadata.yaml"
7153
replacements:
7254
- old: "imagePullPolicy: Always"
7355
new: "imagePullPolicy: IfNotPresent"
74-
- name: "{go://github.com/k0sproject/k0smotron@v1.7}"
75-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.7}/control-plane-components.yaml
56+
- name: "{go://github.com/k0sproject/k0smotron@v1.8}"
57+
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.8}/control-plane-components.yaml
7658
type: url
7759
contract: v1beta1
7860
files:
7961
- sourcePath: "../../metadata.yaml"
8062
replacements:
8163
- old: "imagePullPolicy: Always"
8264
new: "imagePullPolicy: IfNotPresent"
83-
- name: "{go://github.com/k0sproject/k0smotron@v1.8}"
84-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.8}/control-plane-components.yaml
65+
- name: "{go://github.com/k0sproject/k0smotron@v1.9}"
66+
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.9}/control-plane-components.yaml
8567
type: url
8668
contract: v1beta1
8769
files:
8870
- sourcePath: "../../metadata.yaml"
8971
replacements:
9072
- old: "imagePullPolicy: Always"
9173
new: "imagePullPolicy: IfNotPresent"
92-
- name: v1.9.99 # potentially next release. Manifest from source files (development) are used.
74+
- name: v1.10.99 # potentially next release. Manifest from source files (development) are used.
9375
value: ../../config/default
9476
contract: v1beta1
9577
files:
@@ -102,26 +84,26 @@ providers:
10284
- name: k0sproject-k0smotron
10385
type: BootstrapProvider
10486
versions:
105-
- name: "{go://github.com/k0sproject/k0smotron@v1.4}"
106-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.4}/bootstrap-components.yaml
87+
- name: "{go://github.com/k0sproject/k0smotron@v1.7}"
88+
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.7}/bootstrap-components.yaml
10789
type: url
10890
contract: v1beta1
10991
files:
11092
- sourcePath: "../../metadata.yaml"
11193
replacements:
11294
- old: "imagePullPolicy: Always"
11395
new: "imagePullPolicy: IfNotPresent"
114-
- name: "{go://github.com/k0sproject/k0smotron@v1.5}"
115-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.5}/bootstrap-components.yaml
96+
- name: "{go://github.com/k0sproject/k0smotron@v1.8}"
97+
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.8}/bootstrap-components.yaml
11698
type: url
11799
contract: v1beta1
118100
files:
119101
- sourcePath: "../../metadata.yaml"
120102
replacements:
121103
- old: "imagePullPolicy: Always"
122104
new: "imagePullPolicy: IfNotPresent"
123-
- name: "{go://github.com/k0sproject/k0smotron@v1.6}"
124-
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.6}/bootstrap-components.yaml
105+
- name: "{go://github.com/k0sproject/k0smotron@v1.9}"
106+
value: https://github.com/k0sproject/k0smotron/releases/download/{go://github.com/k0sproject/k0smotron@v1.9}/bootstrap-components.yaml
125107
type: url
126108
contract: v1beta1
127109
files:
@@ -147,7 +129,7 @@ providers:
147129
replacements:
148130
- old: "imagePullPolicy: Always"
149131
new: "imagePullPolicy: IfNotPresent"
150-
- name: v1.9.99 # potentially next release. Manifest from source files (development) are used.
132+
- name: v1.10.99 # potentially next release. Manifest from source files (development) are used.
151133
value: ../../config/default
152134
contract: v1beta1
153135
files:

‎e2e/k0smotron_upgrade_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestK0smotronUpgrade(t *testing.T) {
4949
// Important: This version MUST match the ones set in the e2e config file because that guarantees that the clusterctl
5050
// local repository contains the required versions of the providers when running the upgrade tests. We should test
5151
// development version against the latests stable version of k0smotron.
52-
var k0smotronMinorVersionsToCheckUpgrades = []string{"1.5", "1.6", "1.7", "1.8"}
52+
var k0smotronMinorVersionsToCheckUpgrades = []string{"1.7", "1.8", "1.9"}
5353

5454
func k0smotronUpgradeSpec(t *testing.T) {
5555

‎metadata.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ releaseSeries:
3838
- major: 1
3939
minor: 9
4040
contract: v1beta1
41+
- major: 1
42+
minor: 10
43+
contract: v1beta1

0 commit comments

Comments
 (0)