Skip to content

Commit 3081d3a

Browse files
phiscophisco
authored
Merge pull request #58 from olvesh/v1beta1-internally
Changed all v1alpha1 references to v1beta1
2 parents 3923522 + 4f2ac95 commit 3081d3a

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

‎example/environmentConfigs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: apiextensions.crossplane.io/v1alpha1
2+
apiVersion: apiextensions.crossplane.io/v1beta1
33
kind: EnvironmentConfig
44
metadata:
55
name: example-config

‎example/kubecon-2024/environmentConfigs.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: apiextensions.crossplane.io/v1alpha1
2+
apiVersion: apiextensions.crossplane.io/v1beta1
33
kind: EnvironmentConfig
44
metadata:
55
name: example-config
@@ -10,7 +10,7 @@ data:
1010
d: e
1111
f: "1"
1212
---
13-
apiVersion: apiextensions.crossplane.io/v1alpha1
13+
apiVersion: apiextensions.crossplane.io/v1beta1
1414
kind: EnvironmentConfig
1515
metadata:
1616
name: example-config-by-label

‎fn.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ func buildRequirements(in *v1beta1.Input, xr *resource.Composite) (*fnv1.Require
265265
switch config.Type {
266266
case v1beta1.EnvironmentSourceTypeReference, "":
267267
extraResources[extraResName] = &fnv1.ResourceSelector{
268-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
268+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
269269
Kind: "EnvironmentConfig",
270270
Match: &fnv1.ResourceSelector_MatchName{
271271
MatchName: config.Ref.Name,
@@ -293,7 +293,7 @@ func buildRequirements(in *v1beta1.Input, xr *resource.Composite) (*fnv1.Require
293293
continue
294294
}
295295
extraResources[extraResName] = &fnv1.ResourceSelector{
296-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
296+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
297297
Kind: "EnvironmentConfig",
298298
Match: &fnv1.ResourceSelector_MatchLabels{
299299
MatchLabels: &fnv1.MatchLabels{Labels: matchLabels},

‎fn_test.go‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ func TestRunFunction(t *testing.T) {
6060
"kind": "Input",
6161
"spec": {
6262
"environmentConfigs": [
63-
{
63+
{
6464
"type": "Reference",
65-
"ref": {
65+
"ref": {
6666
"name": "my-env-config"
6767
}
6868
},
69-
{
69+
{
7070
"type": "Reference",
71-
"ref": {
71+
"ref": {
7272
"name": "my-second-env-config"
7373
}
7474
},
@@ -123,21 +123,21 @@ func TestRunFunction(t *testing.T) {
123123
Requirements: &fnv1.Requirements{
124124
ExtraResources: map[string]*fnv1.ResourceSelector{
125125
"environment-config-0": {
126-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
126+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
127127
Kind: "EnvironmentConfig",
128128
Match: &fnv1.ResourceSelector_MatchName{
129129
MatchName: "my-env-config",
130130
},
131131
},
132132
"environment-config-1": {
133-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
133+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
134134
Kind: "EnvironmentConfig",
135135
Match: &fnv1.ResourceSelector_MatchName{
136136
MatchName: "my-second-env-config",
137137
},
138138
},
139139
"environment-config-2": {
140-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
140+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
141141
Kind: "EnvironmentConfig",
142142
Match: &fnv1.ResourceSelector_MatchLabels{
143143
MatchLabels: &fnv1.MatchLabels{
@@ -149,7 +149,7 @@ func TestRunFunction(t *testing.T) {
149149
},
150150
// environment-config-3 is not requested because it was optional
151151
"environment-config-4": {
152-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
152+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
153153
Kind: "EnvironmentConfig",
154154
Match: &fnv1.ResourceSelector_MatchLabels{
155155
MatchLabels: &fnv1.MatchLabels{
@@ -188,7 +188,7 @@ func TestRunFunction(t *testing.T) {
188188
Items: []*fnv1.Resource{
189189
{
190190
Resource: resource.MustStructJSON(`{
191-
"apiVersion": "apiextensions.crossplane.io/v1alpha1",
191+
"apiVersion": "apiextensions.crossplane.io/v1beta1",
192192
"kind": "EnvironmentConfig",
193193
"metadata": {
194194
"name": "my-env-config"
@@ -205,7 +205,7 @@ func TestRunFunction(t *testing.T) {
205205
Items: []*fnv1.Resource{
206206
{
207207
Resource: resource.MustStructJSON(`{
208-
"apiVersion": "apiextensions.crossplane.io/v1alpha1",
208+
"apiVersion": "apiextensions.crossplane.io/v1beta1",
209209
"kind": "EnvironmentConfig",
210210
"metadata": {
211211
"name": "my-second-env-config"
@@ -222,7 +222,7 @@ func TestRunFunction(t *testing.T) {
222222
Items: []*fnv1.Resource{
223223
{
224224
Resource: resource.MustStructJSON(`{
225-
"apiVersion": "apiextensions.crossplane.io/v1alpha1",
225+
"apiVersion": "apiextensions.crossplane.io/v1beta1",
226226
"kind": "EnvironmentConfig",
227227
"metadata": {
228228
"name": "my-third-env-config-b"
@@ -234,7 +234,7 @@ func TestRunFunction(t *testing.T) {
234234
},
235235
{
236236
Resource: resource.MustStructJSON(`{
237-
"apiVersion": "apiextensions.crossplane.io/v1alpha1",
237+
"apiVersion": "apiextensions.crossplane.io/v1beta1",
238238
"kind": "EnvironmentConfig",
239239
"metadata": {
240240
"name": "my-third-env-config-a"
@@ -250,7 +250,7 @@ func TestRunFunction(t *testing.T) {
250250
Items: []*fnv1.Resource{
251251
{
252252
Resource: resource.MustStructJSON(`{
253-
"apiVersion": "apiextensions.crossplane.io/v1alpha1",
253+
"apiVersion": "apiextensions.crossplane.io/v1beta1",
254254
"kind": "EnvironmentConfig",
255255
"metadata": {
256256
"name": "my-third-env-config"
@@ -266,7 +266,7 @@ func TestRunFunction(t *testing.T) {
266266
Items: []*fnv1.Resource{
267267
{
268268
Resource: resource.MustStructJSON(`{
269-
"apiVersion": "apiextensions.crossplane.io/v1alpha1",
269+
"apiVersion": "apiextensions.crossplane.io/v1beta1",
270270
"kind": "EnvironmentConfig",
271271
"metadata": {
272272
"name": "my-fourth-env-config"
@@ -284,15 +284,15 @@ func TestRunFunction(t *testing.T) {
284284
"kind": "Input",
285285
"spec": {
286286
"environmentConfigs": [
287-
{
287+
{
288288
"type": "Reference",
289-
"ref": {
289+
"ref": {
290290
"name": "my-env-config"
291291
}
292292
},
293-
{
293+
{
294294
"type": "Reference",
295-
"ref": {
295+
"ref": {
296296
"name": "my-second-env-config"
297297
}
298298
},
@@ -347,21 +347,21 @@ func TestRunFunction(t *testing.T) {
347347
Requirements: &fnv1.Requirements{
348348
ExtraResources: map[string]*fnv1.ResourceSelector{
349349
"environment-config-0": {
350-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
350+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
351351
Kind: "EnvironmentConfig",
352352
Match: &fnv1.ResourceSelector_MatchName{
353353
MatchName: "my-env-config",
354354
},
355355
},
356356
"environment-config-1": {
357-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
357+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
358358
Kind: "EnvironmentConfig",
359359
Match: &fnv1.ResourceSelector_MatchName{
360360
MatchName: "my-second-env-config",
361361
},
362362
},
363363
"environment-config-2": {
364-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
364+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
365365
Kind: "EnvironmentConfig",
366366
Match: &fnv1.ResourceSelector_MatchLabels{
367367
MatchLabels: &fnv1.MatchLabels{
@@ -373,7 +373,7 @@ func TestRunFunction(t *testing.T) {
373373
},
374374
// environment-config-3 is not requested because it was optional
375375
"environment-config-4": {
376-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
376+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
377377
Kind: "EnvironmentConfig",
378378
Match: &fnv1.ResourceSelector_MatchLabels{
379379
MatchLabels: &fnv1.MatchLabels{
@@ -451,7 +451,7 @@ func TestRunFunction(t *testing.T) {
451451
Requirements: &fnv1.Requirements{
452452
ExtraResources: map[string]*fnv1.ResourceSelector{
453453
"environment-config-0": {
454-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
454+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
455455
Kind: "EnvironmentConfig",
456456
Match: &fnv1.ResourceSelector_MatchName{
457457
MatchName: "my-env-config",
@@ -485,17 +485,17 @@ func TestRunFunction(t *testing.T) {
485485
"b": "only-from-default",
486486
"e": "overridden-from-input",
487487
"f": "overridden-from-env-config-2"
488-
},
488+
},
489489
"environmentConfigs": [
490-
{
490+
{
491491
"type": "Reference",
492-
"ref": {
492+
"ref": {
493493
"name": "my-env-config"
494494
}
495495
},
496-
{
496+
{
497497
"type": "Reference",
498-
"ref": {
498+
"ref": {
499499
"name": "my-second-env-config"
500500
}
501501
}
@@ -507,7 +507,7 @@ func TestRunFunction(t *testing.T) {
507507
Items: []*fnv1.Resource{
508508
{
509509
Resource: resource.MustStructJSON(`{
510-
"apiVersion": "apiextensions.crossplane.io/v1alpha1",
510+
"apiVersion": "apiextensions.crossplane.io/v1beta1",
511511
"kind": "EnvironmentConfig",
512512
"metadata": {
513513
"name": "my-env-config"
@@ -525,7 +525,7 @@ func TestRunFunction(t *testing.T) {
525525
Items: []*fnv1.Resource{
526526
{
527527
Resource: resource.MustStructJSON(`{
528-
"apiVersion": "apiextensions.crossplane.io/v1alpha1",
528+
"apiVersion": "apiextensions.crossplane.io/v1beta1",
529529
"kind": "EnvironmentConfig",
530530
"metadata": {
531531
"name": "my-second-env-config"
@@ -549,14 +549,14 @@ func TestRunFunction(t *testing.T) {
549549
Requirements: &fnv1.Requirements{
550550
ExtraResources: map[string]*fnv1.ResourceSelector{
551551
"environment-config-0": {
552-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
552+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
553553
Kind: "EnvironmentConfig",
554554
Match: &fnv1.ResourceSelector_MatchName{
555555
MatchName: "my-env-config",
556556
},
557557
},
558558
"environment-config-1": {
559-
ApiVersion: "apiextensions.crossplane.io/v1alpha1",
559+
ApiVersion: "apiextensions.crossplane.io/v1beta1",
560560
Kind: "EnvironmentConfig",
561561
Match: &fnv1.ResourceSelector_MatchName{
562562
MatchName: "my-second-env-config",

0 commit comments

Comments
 (0)