Skip to content

Commit 084ab33

Browse files
tamalsahatamalsaha
authored
Support ops and recommended_for labels (#155)
Signed-off-by: Tamal Saha <[email protected]>
1 parent 7d58715 commit 084ab33

Some content is hidden

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

45 files changed

+677
-52
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ require (
2929
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6
3030
kmodules.xyz/apiversion v0.2.0
3131
kmodules.xyz/authorizer v0.24.0
32-
kmodules.xyz/client-go v0.24.8
32+
kmodules.xyz/client-go v0.24.11-0.20220914055637-22248cd93387
3333
kmodules.xyz/custom-resources v0.24.0
3434
kmodules.xyz/monitoring-agent-api v0.24.0
35-
kmodules.xyz/resource-metadata v0.12.6
35+
kmodules.xyz/resource-metadata v0.12.7-0.20220914071436-a37b22ec0491
3636
kmodules.xyz/resource-metrics v0.10.1
3737
kmodules.xyz/sets v0.24.0
3838
kubepack.dev/kubepack v0.4.1-0.20220604085220-0b1719a66516

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -1783,17 +1783,17 @@ kmodules.xyz/apply v0.24.1 h1:u6/iEB3JQsyRSmf2Xl39psiHxV3dc6VtQUY5WUQZ1y0=
17831783
kmodules.xyz/apply v0.24.1/go.mod h1:iA3BjyTtth8+IcWRY2l5D6Cpfi8sh+VMlDgH41Cn79o=
17841784
kmodules.xyz/authorizer v0.24.0 h1:iG/NOtobyOhJyPBDqkavY05Jy0Ta+kDNMscq8BsbXWU=
17851785
kmodules.xyz/authorizer v0.24.0/go.mod h1:0Evb5ww/P9GRReiFd80mjwzMIQ6Zlfb80sz9Mkng0To=
1786-
kmodules.xyz/client-go v0.24.8 h1:oCU1mYwb+0jw0j1IBcuu2qQmTYfamqXsuvyYFjSKcYU=
1787-
kmodules.xyz/client-go v0.24.8/go.mod h1:wTV6xDTJT8PYnHg33tg1ofVWvIXAboQGH+OKUCJwja0=
1786+
kmodules.xyz/client-go v0.24.11-0.20220914055637-22248cd93387 h1:e9MKqR6uupYRi6DeuAA9qZWH774U4rwJYsgvEF0xo2E=
1787+
kmodules.xyz/client-go v0.24.11-0.20220914055637-22248cd93387/go.mod h1:wTV6xDTJT8PYnHg33tg1ofVWvIXAboQGH+OKUCJwja0=
17881788
kmodules.xyz/crd-schema-fuzz v0.24.1 h1:DGYhkkYCb39OGr23yPsXuOJVMQtCnjWbkNYSG3P7vzk=
17891789
kmodules.xyz/custom-resources v0.24.0 h1:OWQHB2oFh5q+RjeVfwrsJTZ3NbcclBtghETvq3lGhP8=
17901790
kmodules.xyz/custom-resources v0.24.0/go.mod h1:S6+TonEzosMPXbTA0gkh8djnw+mhLtwCN41a3PNUtsY=
17911791
kmodules.xyz/monitoring-agent-api v0.24.0 h1:CPFvzDppUKckMBLwaMnZbpYCuP7+NhcS4t7dWNTIgQo=
17921792
kmodules.xyz/monitoring-agent-api v0.24.0/go.mod h1:lu1TmXRMx9IcjMpY8s5nc4HNOhOix5/z9caEnbL8JxA=
17931793
kmodules.xyz/offshoot-api v0.24.1 h1:8KCVNkLwdebzWmHcTdZPTQGxqI92bqA+vrmz65ueULY=
17941794
kmodules.xyz/offshoot-api v0.24.1/go.mod h1:fYu0051hoJXXs70OjmIE+Q5smOgmzvYFhRJXCiFShaY=
1795-
kmodules.xyz/resource-metadata v0.12.6 h1:heh+6+kHjXu/lKlCMPmVQnEP1EapFiGfzD31vfZ7Bw0=
1796-
kmodules.xyz/resource-metadata v0.12.6/go.mod h1:7DqxAbOiNeAisIzxjGnAFrBA6AfX5bDbC2zHiU5PHSI=
1795+
kmodules.xyz/resource-metadata v0.12.7-0.20220914071436-a37b22ec0491 h1:1h9TT06WjmPmw4KKVuOE1dGyHS4q9062abyEVEINPyY=
1796+
kmodules.xyz/resource-metadata v0.12.7-0.20220914071436-a37b22ec0491/go.mod h1:VHeM3zwmzHyhvcF0ktnIg7cLemOA434HUDFWHfSCL8Q=
17971797
kmodules.xyz/resource-metrics v0.10.1 h1:q1dhk0eYxkZqd1peRy9wHGd8tOktBBH3kzgeTVaNBiY=
17981798
kmodules.xyz/resource-metrics v0.10.1/go.mod h1:YK0hjiLq6oBaGROmLSVcVDbmEgSxT1vpt8BCZZ+9teY=
17991799
kmodules.xyz/sets v0.24.0 h1:GbltLEPVnURjcmWyf8eFstgJBpm9o151wsrABkByGrc=

‎pkg/graph/exec.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ limitations under the License.
1717
package graph
1818

1919
import (
20+
"kubeops.dev/ui-server/pkg/shared"
21+
2022
"k8s.io/apimachinery/pkg/runtime/schema"
2123
rsapi "kmodules.xyz/resource-metadata/apis/meta/v1alpha1"
2224
"kmodules.xyz/resource-metadata/hub/resourcedescriptors"
2325
"kmodules.xyz/resource-metadata/pkg/tableconvertor"
24-
"kubeops.dev/ui-server/pkg/shared"
2526
)
2627

2728
func RenderExec(src, target *schema.GroupVersionResource) tableconvertor.ResourceExecFunc {

‎pkg/graph/graph.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (g *ObjectGraph) Links(oid *kmapi.ObjectID, edgeLabel kmapi.EdgeLabel) (map
119119
g.m.RLock()
120120
defer g.m.RUnlock()
121121

122-
if edgeLabel == kmapi.EdgeOffshoot || edgeLabel == kmapi.EdgeView {
122+
if edgeLabel.Direct() {
123123
return g.links(oid, nil, edgeLabel)
124124
}
125125

‎vendor/kmodules.xyz/client-go/api/v1/object.go

+22-13
Original file line numberDiff line numberDiff line change
@@ -207,20 +207,29 @@ type ObjectInfo struct {
207207
Ref ObjectReference `json:"ref" protobuf:"bytes,2,opt,name=ref"`
208208
}
209209

210-
// +kubebuilder:validation:Enum=auth_via;backup_via;catalog;connect_via;exposed_by;monitored_by;offshoot;restore_into;scaled_by;view;cert_issuer;policy
210+
// +kubebuilder:validation:Enum=auth_via;backup_via;catalog;connect_via;exposed_by;monitored_by;offshoot;restore_into;scaled_by;view;cert_issuer;policy;recommended_for;ops
211211
type EdgeLabel string
212212

213213
const (
214-
EdgeAuthVia EdgeLabel = "auth_via"
215-
EdgeBackupVia EdgeLabel = "backup_via"
216-
EdgeCatalog EdgeLabel = "catalog"
217-
EdgeConnectVia EdgeLabel = "connect_via"
218-
EdgeExposedBy EdgeLabel = "exposed_by"
219-
EdgeMonitoredBy EdgeLabel = "monitored_by"
220-
EdgeOffshoot EdgeLabel = "offshoot"
221-
EdgeRestoreInto EdgeLabel = "restore_into"
222-
EdgeScaledBy EdgeLabel = "scaled_by"
223-
EdgeView EdgeLabel = "view"
224-
EdgeCertIssuer EdgeLabel = "cert_issuer"
225-
EdgePolicy EdgeLabel = "policy"
214+
EdgeAuthVia EdgeLabel = "auth_via"
215+
EdgeBackupVia EdgeLabel = "backup_via"
216+
EdgeCatalog EdgeLabel = "catalog"
217+
EdgeConnectVia EdgeLabel = "connect_via"
218+
EdgeExposedBy EdgeLabel = "exposed_by"
219+
EdgeMonitoredBy EdgeLabel = "monitored_by"
220+
EdgeOffshoot EdgeLabel = "offshoot"
221+
EdgeRestoreInto EdgeLabel = "restore_into"
222+
EdgeScaledBy EdgeLabel = "scaled_by"
223+
EdgeView EdgeLabel = "view"
224+
EdgeCertIssuer EdgeLabel = "cert_issuer"
225+
EdgePolicy EdgeLabel = "policy"
226+
EdgeOps EdgeLabel = "ops"
227+
EdgeRecommendedFor EdgeLabel = "recommended_for"
226228
)
229+
230+
func (e EdgeLabel) Direct() bool {
231+
return e == EdgeOffshoot ||
232+
e == EdgeView ||
233+
e == EdgeOps ||
234+
e == EdgeRecommendedFor
235+
}

‎vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_resourceblockdefinitions.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ spec:
7474
- view
7575
- cert_issuer
7676
- policy
77+
- recommended_for
78+
- ops
7779
type: string
7880
raw:
7981
type: string

‎vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_resourcedescriptors.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ spec:
5959
- view
6060
- cert_issuer
6161
- policy
62+
- recommended_for
63+
- ops
6264
type: string
6365
type: array
6466
level:
@@ -199,6 +201,8 @@ spec:
199201
- view
200202
- cert_issuer
201203
- policy
204+
- recommended_for
205+
- ops
202206
type: string
203207
raw:
204208
type: string

‎vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_resourcelayouts.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ spec:
7575
- view
7676
- cert_issuer
7777
- policy
78+
- recommended_for
79+
- ops
7880
type: string
7981
raw:
8082
type: string
@@ -271,6 +273,8 @@ spec:
271273
- view
272274
- cert_issuer
273275
- policy
276+
- recommended_for
277+
- ops
274278
type: string
275279
raw:
276280
type: string
@@ -469,6 +473,8 @@ spec:
469473
- view
470474
- cert_issuer
471475
- policy
476+
- recommended_for
477+
- ops
472478
type: string
473479
raw:
474480
type: string
@@ -665,6 +671,8 @@ spec:
665671
- view
666672
- cert_issuer
667673
- policy
674+
- recommended_for
675+
- ops
668676
type: string
669677
raw:
670678
type: string
@@ -892,6 +900,8 @@ spec:
892900
- view
893901
- cert_issuer
894902
- policy
903+
- recommended_for
904+
- ops
895905
type: string
896906
raw:
897907
type: string

‎vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_resourceoutlines.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ spec:
7575
- view
7676
- cert_issuer
7777
- policy
78+
- recommended_for
79+
- ops
7880
type: string
7981
raw:
8082
type: string
@@ -272,6 +274,8 @@ spec:
272274
- view
273275
- cert_issuer
274276
- policy
277+
- recommended_for
278+
- ops
275279
type: string
276280
raw:
277281
type: string
@@ -471,6 +475,8 @@ spec:
471475
- view
472476
- cert_issuer
473477
- policy
478+
- recommended_for
479+
- ops
474480
type: string
475481
raw:
476482
type: string
@@ -668,6 +674,8 @@ spec:
668674
- view
669675
- cert_issuer
670676
- policy
677+
- recommended_for
678+
- ops
671679
type: string
672680
raw:
673681
type: string
@@ -898,6 +906,8 @@ spec:
898906
- view
899907
- cert_issuer
900908
- policy
909+
- recommended_for
910+
- ops
901911
type: string
902912
raw:
903913
type: string

‎vendor/kmodules.xyz/resource-metadata/crds/ui.k8s.appscode.com_resourcedashboards.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ spec:
6464
- view
6565
- cert_issuer
6666
- policy
67+
- recommended_for
68+
- ops
6769
type: string
6870
raw:
6971
type: string

‎vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/elasticsearchopsrequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
connections:
1313
- labels:
14-
- offshoot
14+
- ops
1515
references:
1616
- '{.spec.databaseRef.name}'
1717
target:

‎vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/etcdopsrequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
connections:
1313
- labels:
14-
- offshoot
14+
- ops
1515
references:
1616
- '{.spec.databaseRef.name}'
1717
target:

‎vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/mariadbopsrequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
connections:
1313
- labels:
14-
- offshoot
14+
- ops
1515
references:
1616
- '{.spec.databaseRef.name}'
1717
target:

‎vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/memcachedopsrequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
connections:
1313
- labels:
14-
- offshoot
14+
- ops
1515
references:
1616
- '{.spec.databaseRef.name}'
1717
target:

‎vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/mongodbopsrequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
connections:
1313
- labels:
14-
- offshoot
14+
- ops
1515
references:
1616
- '{.spec.databaseRef.name}'
1717
target:

‎vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/mysqlopsrequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
connections:
1313
- labels:
14-
- offshoot
14+
- ops
1515
references:
1616
- '{.spec.databaseRef.name}'
1717
target:

‎vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/perconaxtradbopsrequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
connections:
1313
- labels:
14-
- offshoot
14+
- ops
1515
references:
1616
- '{.spec.databaseRef.name}'
1717
target:

‎vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/pgbounceropsrequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
connections:
1313
- labels:
14-
- offshoot
14+
- ops
1515
references:
1616
- '{.spec.databaseRef.name}'
1717
target:

‎vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/postgresopsrequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
connections:
1313
- labels:
14-
- offshoot
14+
- ops
1515
references:
1616
- '{.spec.databaseRef.name}'
1717
target:

‎vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/proxysqlopsrequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
connections:
1313
- labels:
14-
- offshoot
14+
- ops
1515
references:
1616
- '{.spec.databaseRef.name}'
1717
target:

‎vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/redisopsrequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
connections:
1313
- labels:
14-
- offshoot
14+
- ops
1515
references:
1616
- '{.spec.databaseRef.name}'
1717
target:

0 commit comments

Comments
 (0)