Skip to content

Commit 36ab6bb

Browse files
authored
Merge branch 'master' into fix/aso-manifest-dedup
2 parents 9ab701d + a3be5a1 commit 36ab6bb

41 files changed

Lines changed: 2570 additions & 147 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

converter/tests/samples/edge-firewall-relationship.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@ relationships:
14541454
relationships_count: 0
14551455
components: null
14561456
relationships: null
1457-
schemaVersion: relationships.meshery.io/v1alpha3
1457+
schemaVersion: relationships.meshery.io/v1beta2
14581458
selectors:
14591459
- allow:
14601460
from:
@@ -1582,7 +1582,7 @@ relationships:
15821582
relationships_count: 0
15831583
components: null
15841584
relationships: null
1585-
schemaVersion: relationships.meshery.io/v1alpha3
1585+
schemaVersion: relationships.meshery.io/v1beta2
15861586
selectors:
15871587
- allow:
15881588
from:
@@ -1710,7 +1710,7 @@ relationships:
17101710
relationships_count: 0
17111711
components: null
17121712
relationships: null
1713-
schemaVersion: relationships.meshery.io/v1alpha3
1713+
schemaVersion: relationships.meshery.io/v1beta2
17141714
selectors:
17151715
- allow:
17161716
from:
@@ -1838,7 +1838,7 @@ relationships:
18381838
relationships_count: 0
18391839
components: null
18401840
relationships: null
1841-
schemaVersion: relationships.meshery.io/v1alpha3
1841+
schemaVersion: relationships.meshery.io/v1beta2
18421842
selectors:
18431843
- allow:
18441844
from:
@@ -1974,7 +1974,7 @@ relationships:
19741974
relationships_count: 0
19751975
components: null
19761976
relationships: null
1977-
schemaVersion: relationships.meshery.io/v1alpha3
1977+
schemaVersion: relationships.meshery.io/v1beta2
19781978
selectors:
19791979
- allow:
19801980
from:
@@ -2127,7 +2127,7 @@ relationships:
21272127
relationships_count: 0
21282128
components: null
21292129
relationships: null
2130-
schemaVersion: relationships.meshery.io/v1alpha3
2130+
schemaVersion: relationships.meshery.io/v1beta2
21312131
selectors:
21322132
- allow:
21332133
from:
@@ -2263,7 +2263,7 @@ relationships:
22632263
relationships_count: 0
22642264
components: null
22652265
relationships: null
2266-
schemaVersion: relationships.meshery.io/v1alpha3
2266+
schemaVersion: relationships.meshery.io/v1beta2
22672267
selectors:
22682268
- allow:
22692269
from:
@@ -2416,7 +2416,7 @@ relationships:
24162416
relationships_count: 0
24172417
components: null
24182418
relationships: null
2419-
schemaVersion: relationships.meshery.io/v1alpha3
2419+
schemaVersion: relationships.meshery.io/v1beta2
24202420
selectors:
24212421
- allow:
24222422
from:

files/error.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99

1010
"github.com/meshery/meshkit/errors"
11-
coreV1 "github.com/meshery/schemas/models/v1alpha1/core"
11+
coreV1 "github.com/meshery/schemas/models/core"
1212
)
1313

1414
var (

files/identification.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/meshery/meshkit/utils"
1717
"github.com/meshery/meshkit/utils/kubernetes/kompose"
1818
"github.com/meshery/meshkit/utils/walker"
19-
coreV1 "github.com/meshery/schemas/models/v1alpha1/core"
19+
coreV1 "github.com/meshery/schemas/models/core"
2020
"github.com/meshery/schemas/models/v1beta1"
2121
"github.com/meshery/schemas/models/v1beta1/pattern"
2222

files/tests/samples/valid_design.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ relationships:
309309
components_count: 0
310310
relationships_count: 0
311311
modelid: 00000000-0000-0000-0000-000000000000
312-
schemaVersion: relationships.meshery.io/v1alpha3
312+
schemaVersion: relationships.meshery.io/v1beta2
313313
selectors:
314314
- allow:
315315
from:

files/tests/sanitization_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"archive/zip"
1111
"github.com/meshery/meshkit/errors"
1212
"github.com/meshery/meshkit/files"
13-
coreV1 "github.com/meshery/schemas/models/v1alpha1/core"
13+
coreV1 "github.com/meshery/schemas/models/core"
1414
"github.com/stretchr/testify/assert"
1515
)
1616

generators/artifacthub/crossplane-types/CompositeResourceDefinition.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@
4646
"relationships": null
4747
},
4848
"modelReference": {
49-
"version": "",
50-
"name": "",
5149
"displayName": "",
5250
"id": "00000000-0000-0000-0000-000000000000",
51+
"model": {
52+
"version": ""
53+
},
54+
"name": "",
5355
"registrant": {
5456
"kind": ""
5557
},
56-
"model": {
5758
"version": ""
58-
}
5959
},
6060
"styles": null,
6161
"capabilities": null,

generators/artifacthub/crossplane-types/Composition.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@
4646
"relationships": null
4747
},
4848
"modelReference": {
49-
"version": "",
50-
"name": "",
5149
"displayName": "",
5250
"id": "00000000-0000-0000-0000-000000000000",
51+
"model": {
52+
"version": ""
53+
},
54+
"name": "",
5355
"registrant": {
5456
"kind": ""
5557
},
56-
"model": {
5758
"version": ""
58-
}
5959
},
6060
"styles": null,
6161
"capabilities": null,

generators/artifacthub/crossplane-types/Configuration.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@
4646
"relationships": null
4747
},
4848
"modelReference": {
49-
"version": "",
50-
"name": "",
5149
"displayName": "",
5250
"id": "00000000-0000-0000-0000-000000000000",
51+
"model": {
52+
"version": ""
53+
},
54+
"name": "",
5355
"registrant": {
5456
"kind": ""
5557
},
56-
"model": {
5758
"version": ""
58-
}
5959
},
6060
"styles": null,
6161
"capabilities": null,

generators/artifacthub/crossplane-types/ConfigurationRevision.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@
4646
"relationships": null
4747
},
4848
"modelReference": {
49-
"version": "",
50-
"name": "",
5149
"displayName": "",
5250
"id": "00000000-0000-0000-0000-000000000000",
51+
"model": {
52+
"version": ""
53+
},
54+
"name": "",
5355
"registrant": {
5456
"kind": ""
5557
},
56-
"model": {
5758
"version": ""
58-
}
5959
},
6060
"styles": null,
6161
"capabilities": null,

generators/artifacthub/crossplane-types/KubernetesApplication.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@
4646
"relationships": null
4747
},
4848
"modelReference": {
49-
"version": "",
50-
"name": "",
5149
"displayName": "",
5250
"id": "00000000-0000-0000-0000-000000000000",
51+
"model": {
52+
"version": ""
53+
},
54+
"name": "",
5355
"registrant": {
5456
"kind": ""
5557
},
56-
"model": {
5758
"version": ""
58-
}
5959
},
6060
"styles": null,
6161
"capabilities": null,

0 commit comments

Comments
 (0)