Skip to content

Commit 49d1fbc

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 93fdfa3 + 6e9ca47 commit 49d1fbc

20 files changed

Lines changed: 76 additions & 38 deletions

charts/rhai-on-xks-chart/templates/crds/customresourcedefinition-kserves.components.platform.opendatahub.io.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ spec:
134134
- message: nodeNames and nodeSelector are mutually exclusive
135135
rule: '!(has(self.nodeNames) && has(self.nodeSelector))'
136136
modelsAsService:
137+
default: {}
137138
description: Configures and enables Models as a Service integration
138139
properties:
139140
managementState:
@@ -204,6 +205,7 @@ spec:
204205
- Headed
205206
type: string
206207
wva:
208+
default: {}
207209
description: Configures and enables workload-variant-autoscaler (WVA) integration
208210
properties:
209211
managementState:

charts/rhai-on-xks-chart/templates/rbac/clusterrole-rhods-operator-role.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ rules:
832832
- apiGroups:
833833
- maas.opendatahub.io
834834
resources:
835-
- tenants
835+
- maastenantconfigs
836836
verbs:
837837
- delete
838838
- get
@@ -841,7 +841,7 @@ rules:
841841
- apiGroups:
842842
- maas.opendatahub.io
843843
resources:
844-
- tenants/status
844+
- maastenantconfigs/status
845845
verbs:
846846
- get
847847
- apiGroups:

charts/rhai-on-xks-chart/test/snapshots/aws-with-all-deps-managed.snap.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,7 @@ spec:
577577
- message: nodeNames and nodeSelector are mutually exclusive
578578
rule: '!(has(self.nodeNames) && has(self.nodeSelector))'
579579
modelsAsService:
580+
default: {}
580581
description: Configures and enables Models as a Service integration
581582
properties:
582583
managementState:
@@ -647,6 +648,7 @@ spec:
647648
- Headed
648649
type: string
649650
wva:
651+
default: {}
650652
description: Configures and enables workload-variant-autoscaler (WVA) integration
651653
properties:
652654
managementState:
@@ -2055,7 +2057,7 @@ rules:
20552057
- apiGroups:
20562058
- maas.opendatahub.io
20572059
resources:
2058-
- tenants
2060+
- maastenantconfigs
20592061
verbs:
20602062
- delete
20612063
- get
@@ -2064,7 +2066,7 @@ rules:
20642066
- apiGroups:
20652067
- maas.opendatahub.io
20662068
resources:
2067-
- tenants/status
2069+
- maastenantconfigs/status
20682070
verbs:
20692071
- get
20702072
- apiGroups:

charts/rhai-on-xks-chart/test/snapshots/aws-with-allowed-routes-all.snap.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@ spec:
418418
- message: nodeNames and nodeSelector are mutually exclusive
419419
rule: '!(has(self.nodeNames) && has(self.nodeSelector))'
420420
modelsAsService:
421+
default: {}
421422
description: Configures and enables Models as a Service integration
422423
properties:
423424
managementState:
@@ -488,6 +489,7 @@ spec:
488489
- Headed
489490
type: string
490491
wva:
492+
default: {}
491493
description: Configures and enables workload-variant-autoscaler (WVA) integration
492494
properties:
493495
managementState:
@@ -1896,7 +1898,7 @@ rules:
18961898
- apiGroups:
18971899
- maas.opendatahub.io
18981900
resources:
1899-
- tenants
1901+
- maastenantconfigs
19001902
verbs:
19011903
- delete
19021904
- get
@@ -1905,7 +1907,7 @@ rules:
19051907
- apiGroups:
19061908
- maas.opendatahub.io
19071909
resources:
1908-
- tenants/status
1910+
- maastenantconfigs/status
19091911
verbs:
19101912
- get
19111913
- apiGroups:

charts/rhai-on-xks-chart/test/snapshots/aws-with-allowed-routes-same.snap.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@ spec:
418418
- message: nodeNames and nodeSelector are mutually exclusive
419419
rule: '!(has(self.nodeNames) && has(self.nodeSelector))'
420420
modelsAsService:
421+
default: {}
421422
description: Configures and enables Models as a Service integration
422423
properties:
423424
managementState:
@@ -488,6 +489,7 @@ spec:
488489
- Headed
489490
type: string
490491
wva:
492+
default: {}
491493
description: Configures and enables workload-variant-autoscaler (WVA) integration
492494
properties:
493495
managementState:
@@ -1896,7 +1898,7 @@ rules:
18961898
- apiGroups:
18971899
- maas.opendatahub.io
18981900
resources:
1899-
- tenants
1901+
- maastenantconfigs
19001902
verbs:
19011903
- delete
19021904
- get
@@ -1905,7 +1907,7 @@ rules:
19051907
- apiGroups:
19061908
- maas.opendatahub.io
19071909
resources:
1908-
- tenants/status
1910+
- maastenantconfigs/status
19091911
verbs:
19101912
- get
19111913
- apiGroups:

charts/rhai-on-xks-chart/test/snapshots/aws-with-pull-secret.snap.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,7 @@ spec:
553553
- message: nodeNames and nodeSelector are mutually exclusive
554554
rule: '!(has(self.nodeNames) && has(self.nodeSelector))'
555555
modelsAsService:
556+
default: {}
556557
description: Configures and enables Models as a Service integration
557558
properties:
558559
managementState:
@@ -623,6 +624,7 @@ spec:
623624
- Headed
624625
type: string
625626
wva:
627+
default: {}
626628
description: Configures and enables workload-variant-autoscaler (WVA) integration
627629
properties:
628630
managementState:
@@ -2031,7 +2033,7 @@ rules:
20312033
- apiGroups:
20322034
- maas.opendatahub.io
20332035
resources:
2034-
- tenants
2036+
- maastenantconfigs
20352037
verbs:
20362038
- delete
20372039
- get
@@ -2040,7 +2042,7 @@ rules:
20402042
- apiGroups:
20412043
- maas.opendatahub.io
20422044
resources:
2043-
- tenants/status
2045+
- maastenantconfigs/status
20442046
verbs:
20452047
- get
20462048
- apiGroups:

charts/rhai-on-xks-chart/test/snapshots/aws.snap.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@ spec:
418418
- message: nodeNames and nodeSelector are mutually exclusive
419419
rule: '!(has(self.nodeNames) && has(self.nodeSelector))'
420420
modelsAsService:
421+
default: {}
421422
description: Configures and enables Models as a Service integration
422423
properties:
423424
managementState:
@@ -488,6 +489,7 @@ spec:
488489
- Headed
489490
type: string
490491
wva:
492+
default: {}
491493
description: Configures and enables workload-variant-autoscaler (WVA) integration
492494
properties:
493495
managementState:
@@ -1896,7 +1898,7 @@ rules:
18961898
- apiGroups:
18971899
- maas.opendatahub.io
18981900
resources:
1899-
- tenants
1901+
- maastenantconfigs
19001902
verbs:
19011903
- delete
19021904
- get
@@ -1905,7 +1907,7 @@ rules:
19051907
- apiGroups:
19061908
- maas.opendatahub.io
19071909
resources:
1908-
- tenants/status
1910+
- maastenantconfigs/status
19091911
verbs:
19101912
- get
19111913
- apiGroups:

charts/rhai-on-xks-chart/test/snapshots/azure-with-all-deps-managed.snap.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,7 @@ spec:
577577
- message: nodeNames and nodeSelector are mutually exclusive
578578
rule: '!(has(self.nodeNames) && has(self.nodeSelector))'
579579
modelsAsService:
580+
default: {}
580581
description: Configures and enables Models as a Service integration
581582
properties:
582583
managementState:
@@ -647,6 +648,7 @@ spec:
647648
- Headed
648649
type: string
649650
wva:
651+
default: {}
650652
description: Configures and enables workload-variant-autoscaler (WVA) integration
651653
properties:
652654
managementState:
@@ -2055,7 +2057,7 @@ rules:
20552057
- apiGroups:
20562058
- maas.opendatahub.io
20572059
resources:
2058-
- tenants
2060+
- maastenantconfigs
20592061
verbs:
20602062
- delete
20612063
- get
@@ -2064,7 +2066,7 @@ rules:
20642066
- apiGroups:
20652067
- maas.opendatahub.io
20662068
resources:
2067-
- tenants/status
2069+
- maastenantconfigs/status
20682070
verbs:
20692071
- get
20702072
- apiGroups:

charts/rhai-on-xks-chart/test/snapshots/azure-with-byo-issuer.snap.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@ spec:
418418
- message: nodeNames and nodeSelector are mutually exclusive
419419
rule: '!(has(self.nodeNames) && has(self.nodeSelector))'
420420
modelsAsService:
421+
default: {}
421422
description: Configures and enables Models as a Service integration
422423
properties:
423424
managementState:
@@ -488,6 +489,7 @@ spec:
488489
- Headed
489490
type: string
490491
wva:
492+
default: {}
491493
description: Configures and enables workload-variant-autoscaler (WVA) integration
492494
properties:
493495
managementState:
@@ -1896,7 +1898,7 @@ rules:
18961898
- apiGroups:
18971899
- maas.opendatahub.io
18981900
resources:
1899-
- tenants
1901+
- maastenantconfigs
19001902
verbs:
19011903
- delete
19021904
- get
@@ -1905,7 +1907,7 @@ rules:
19051907
- apiGroups:
19061908
- maas.opendatahub.io
19071909
resources:
1908-
- tenants/status
1910+
- maastenantconfigs/status
19091911
verbs:
19101912
- get
19111913
- apiGroups:

charts/rhai-on-xks-chart/test/snapshots/azure-with-cleanup-namespaces.snap.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@ spec:
418418
- message: nodeNames and nodeSelector are mutually exclusive
419419
rule: '!(has(self.nodeNames) && has(self.nodeSelector))'
420420
modelsAsService:
421+
default: {}
421422
description: Configures and enables Models as a Service integration
422423
properties:
423424
managementState:
@@ -488,6 +489,7 @@ spec:
488489
- Headed
489490
type: string
490491
wva:
492+
default: {}
491493
description: Configures and enables workload-variant-autoscaler (WVA) integration
492494
properties:
493495
managementState:
@@ -1896,7 +1898,7 @@ rules:
18961898
- apiGroups:
18971899
- maas.opendatahub.io
18981900
resources:
1899-
- tenants
1901+
- maastenantconfigs
19001902
verbs:
19011903
- delete
19021904
- get
@@ -1905,7 +1907,7 @@ rules:
19051907
- apiGroups:
19061908
- maas.opendatahub.io
19071909
resources:
1908-
- tenants/status
1910+
- maastenantconfigs/status
19091911
verbs:
19101912
- get
19111913
- apiGroups:

0 commit comments

Comments
 (0)