diff --git a/go.mod b/go.mod index 668542838e..09ab8fc394 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( kmodules.xyz/custom-resources v0.29.0 kmodules.xyz/go-containerregistry v0.0.12 kmodules.xyz/monitoring-agent-api v0.29.0 - kmodules.xyz/resource-metadata v0.18.2-0.20240118152448-267a08d36cf0 + kmodules.xyz/resource-metadata v0.18.2-0.20240205132124-d5898b9bd3c1 kmodules.xyz/resource-metrics v0.29.0 kmodules.xyz/sets v0.29.0 kubeops.dev/scanner v0.0.16 diff --git a/go.sum b/go.sum index 496779d6ea..4f2791caec 100644 --- a/go.sum +++ b/go.sum @@ -3456,8 +3456,8 @@ kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9 kmodules.xyz/monitoring-agent-api v0.29.0/go.mod h1:iNbvaMTgVFOI5q2LJtGK91j4Dmjv4ZRiRdasGmWLKQI= kmodules.xyz/offshoot-api v0.29.0 h1:GHLhxxT9jU1N8+FvOCCeJNyU5g0duYS46UGrs6AHNLY= kmodules.xyz/offshoot-api v0.29.0/go.mod h1:5NxhBblXoDHWStx9HCDJR2KFTwYjEZ7i1Id3jelIunw= -kmodules.xyz/resource-metadata v0.18.2-0.20240118152448-267a08d36cf0 h1:AH4FZ4XybovFyuPi0GuOMibM/ID2DVumdmxqic3SpHs= -kmodules.xyz/resource-metadata v0.18.2-0.20240118152448-267a08d36cf0/go.mod h1:I9HeSgkshwzwUy0IDhp4yIfRFbFQJ21syeSf4NsB04o= +kmodules.xyz/resource-metadata v0.18.2-0.20240205132124-d5898b9bd3c1 h1:JShlx4SSVx6jwz4DHqgrkJhlFvIJk7KV5bLbMLolMZc= +kmodules.xyz/resource-metadata v0.18.2-0.20240205132124-d5898b9bd3c1/go.mod h1:I9HeSgkshwzwUy0IDhp4yIfRFbFQJ21syeSf4NsB04o= kmodules.xyz/resource-metrics v0.29.0 h1:YBSVCbGdAugUqZK4igHu3fPhxvpYar4xejE6njryNM4= kmodules.xyz/resource-metrics v0.29.0/go.mod h1:OuG/QobZ7o8GFHl/u3lqaUR0fDZDegxtV8Vdh+MNBD4= kmodules.xyz/sets v0.29.0 h1:ZX/qOECzUob95JhhRtngJElHSlJ1UNNdwK4hTEy+nl0= diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mariadbs.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mariadbs.yaml index 5877b98a7b..7575fe8ca5 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mariadbs.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mariadbs.yaml @@ -112,6 +112,21 @@ spec: container: mariadb help: | show databases; + if: + condition: | + {{- if (hasPrefix "10." .spec.version) }}true{{ else }}false{{ end -}} + serviceNameTemplate: '{{- .metadata.name -}}' + - alias: Primary + command: + - bash + - -c + - mariadb -u"$MYSQL_ROOT_USERNAME" -p"$MYSQL_ROOT_PASSWORD" + container: mariadb + help: | + show databases; + if: + condition: | + {{- if (hasPrefix "10." .spec.version) }}false{{ else }}true{{ end -}} serviceNameTemplate: '{{- .metadata.name -}}' resource: group: kubedb.com diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/elasticsearches.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/elasticsearches.yaml index 8e582eca4a..edd3ca21d0 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/elasticsearches.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/elasticsearches.yaml @@ -199,7 +199,7 @@ spec: view: name: appcatalog.appscode.com-v1alpha1-appbindings-kubedb - actions: - create: Always + create: Never displayMode: List kind: Connection name: VaultServers diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/mariadbs.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/mariadbs.yaml index dbb4921cb0..2383dd4d99 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/mariadbs.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/mariadbs.yaml @@ -199,7 +199,7 @@ spec: view: name: appcatalog.appscode.com-v1alpha1-appbindings-kubedb - actions: - create: Always + create: Never displayMode: List kind: Connection name: VaultServers diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/mongodbs.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/mongodbs.yaml index cdfaa37f5c..0a3ef8116e 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/mongodbs.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/mongodbs.yaml @@ -199,7 +199,7 @@ spec: view: name: appcatalog.appscode.com-v1alpha1-appbindings-kubedb - actions: - create: Always + create: Never displayMode: List kind: Connection name: VaultServers diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/mysqls.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/mysqls.yaml index c1f23395df..31b63577fd 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/mysqls.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/mysqls.yaml @@ -199,7 +199,7 @@ spec: view: name: appcatalog.appscode.com-v1alpha1-appbindings-kubedb - actions: - create: Always + create: Never displayMode: List kind: Connection name: VaultServers diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/postgreses.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/postgreses.yaml index ccf1baae29..144b9535fc 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/postgreses.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/postgreses.yaml @@ -227,7 +227,7 @@ spec: view: name: appcatalog.appscode.com-v1alpha1-appbindings-kubedb - actions: - create: Always + create: Never displayMode: List kind: Connection name: VaultServers diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/redises.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/redises.yaml index 0336107119..969df27ff7 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/redises.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceoutlines/kubedb.com/v1alpha2/kubedb/redises.yaml @@ -199,7 +199,7 @@ spec: view: name: appcatalog.appscode.com-v1alpha1-appbindings-kubedb - actions: - create: Always + create: Never displayMode: List kind: Connection name: VaultServers diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/elasticsearchopsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/elasticsearchopsrequests.yaml index 7746e94224..da1568e467 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/elasticsearchopsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/elasticsearchopsrequests.yaml @@ -29,7 +29,7 @@ spec: {{ if list "Pending" | has $status }} {{ $color = "gray" }} {{ else if list "Progressing" | has $status }} - {{ $color = "primary" }} + {{ $color = "info" }} {{ else if list "Successful" | has $status }} {{ $color = "success" }} {{ else if list "WaitingForApproval" | has $status }} diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/mariadbopsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/mariadbopsrequests.yaml index 67d49f8820..c729a1261a 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/mariadbopsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/mariadbopsrequests.yaml @@ -29,7 +29,7 @@ spec: {{ if list "Pending" | has $status }} {{ $color = "gray" }} {{ else if list "Progressing" | has $status }} - {{ $color = "primary" }} + {{ $color = "info" }} {{ else if list "Successful" | has $status }} {{ $color = "success" }} {{ else if list "WaitingForApproval" | has $status }} diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/memcachedopsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/memcachedopsrequests.yaml index 47bbf10e9c..b3ec852b4c 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/memcachedopsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/memcachedopsrequests.yaml @@ -29,7 +29,7 @@ spec: {{ if list "Pending" | has $status }} {{ $color = "gray" }} {{ else if list "Progressing" | has $status }} - {{ $color = "primary" }} + {{ $color = "info" }} {{ else if list "Successful" | has $status }} {{ $color = "success" }} {{ else if list "WaitingForApproval" | has $status }} diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/mongodbopsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/mongodbopsrequests.yaml index afe0e710ca..f4a8b85e83 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/mongodbopsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/mongodbopsrequests.yaml @@ -29,7 +29,7 @@ spec: {{ if list "Pending" | has $status }} {{ $color = "gray" }} {{ else if list "Progressing" | has $status }} - {{ $color = "primary" }} + {{ $color = "info" }} {{ else if list "Successful" | has $status }} {{ $color = "success" }} {{ else if list "WaitingForApproval" | has $status }} diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/mysqlopsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/mysqlopsrequests.yaml index ef60c2a571..779f1ad9eb 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/mysqlopsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/mysqlopsrequests.yaml @@ -29,7 +29,7 @@ spec: {{ if list "Pending" | has $status }} {{ $color = "gray" }} {{ else if list "Progressing" | has $status }} - {{ $color = "primary" }} + {{ $color = "info" }} {{ else if list "Successful" | has $status }} {{ $color = "success" }} {{ else if list "WaitingForApproval" | has $status }} diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/postgresopsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/postgresopsrequests.yaml index 6293cca0ae..ce5be33264 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/postgresopsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/postgresopsrequests.yaml @@ -29,7 +29,7 @@ spec: {{ if list "Pending" | has $status }} {{ $color = "gray" }} {{ else if list "Progressing" | has $status }} - {{ $color = "primary" }} + {{ $color = "info" }} {{ else if list "Successful" | has $status }} {{ $color = "success" }} {{ else if list "WaitingForApproval" | has $status }} diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/proxysqlopsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/proxysqlopsrequests.yaml index 99da0c89f4..6d92ee5019 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/proxysqlopsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/proxysqlopsrequests.yaml @@ -29,7 +29,7 @@ spec: {{ if list "Pending" | has $status }} {{ $color = "gray" }} {{ else if list "Progressing" | has $status }} - {{ $color = "primary" }} + {{ $color = "info" }} {{ else if list "Successful" | has $status }} {{ $color = "success" }} {{ else if list "WaitingForApproval" | has $status }} diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/redisopsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/redisopsrequests.yaml index de769e378e..a7cbea8cca 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/redisopsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/ops.kubedb.com/v1alpha1/kubedb/redisopsrequests.yaml @@ -29,7 +29,7 @@ spec: {{ if list "Pending" | has $status }} {{ $color = "gray" }} {{ else if list "Progressing" | has $status }} - {{ $color = "primary" }} + {{ $color = "info" }} {{ else if list "Successful" | has $status }} {{ $color = "success" }} {{ else if list "WaitingForApproval" | has $status }} diff --git a/vendor/modules.txt b/vendor/modules.txt index 3a36f25e63..5a26b707e8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1952,7 +1952,7 @@ kmodules.xyz/monitoring-agent-api/client # kmodules.xyz/offshoot-api v0.29.0 ## explicit; go 1.21.5 kmodules.xyz/offshoot-api/api/v1 -# kmodules.xyz/resource-metadata v0.18.2-0.20240118152448-267a08d36cf0 +# kmodules.xyz/resource-metadata v0.18.2-0.20240205132124-d5898b9bd3c1 ## explicit; go 1.21.5 kmodules.xyz/resource-metadata/apis/core/install kmodules.xyz/resource-metadata/apis/core/v1alpha1