diff --git a/go.mod b/go.mod index 1afdc4232..19bc0ef00 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.3 github.com/zeebo/xxh3 v1.0.2 - go.bytebuilders.dev/license-verifier v0.13.3 + go.bytebuilders.dev/license-verifier v0.13.4 go.openviz.dev/apimachinery v0.0.4 golang.org/x/sync v0.4.0 gomodules.xyz/jsonpath v0.0.2 @@ -46,7 +46,7 @@ require ( kmodules.xyz/custom-resources v0.25.2 kmodules.xyz/go-containerregistry v0.0.11 kmodules.xyz/monitoring-agent-api v0.25.4 - kmodules.xyz/resource-metadata v0.17.28 + kmodules.xyz/resource-metadata v0.17.29 kmodules.xyz/resource-metrics v0.25.7 kmodules.xyz/sets v0.25.0 kubeops.dev/scanner v0.0.15 diff --git a/go.sum b/go.sum index 7a626c5e7..df4bcc133 100644 --- a/go.sum +++ b/go.sum @@ -1288,8 +1288,8 @@ github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.bytebuilders.dev/license-verifier v0.13.3 h1:/CnRn1N6qiFjdirydHVBDtOtSlCwOm8cgUi0plZNgjU= -go.bytebuilders.dev/license-verifier v0.13.3/go.mod h1:PTTlWgokzoisBezn2zt+JeGkhTJZ0flvLzdhHVBy86M= +go.bytebuilders.dev/license-verifier v0.13.4 h1:K4qSsTWTZc7lyRvRHfI23XRrbVrQVJ8Ew5afvSiMdBE= +go.bytebuilders.dev/license-verifier v0.13.4/go.mod h1:lcmFhUSBHp5G0YeZop3I8tOUBRegBrDvkW1aTsIRGcU= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= @@ -2151,8 +2151,8 @@ kmodules.xyz/monitoring-agent-api v0.25.4 h1:OwkvtV23QhUy3f7o9lxPWaAW3jiJMGAMPPR kmodules.xyz/monitoring-agent-api v0.25.4/go.mod h1:3LhrLDGQKQXhxYcjA/WNaO4HPpopYQzOutsEp2i3008= kmodules.xyz/offshoot-api v0.25.4 h1:IjJNvkphcdYUG8XO/pBwXpuP8W+jxAWJZ3yH8vgI/as= kmodules.xyz/offshoot-api v0.25.4/go.mod h1:PUk4EuJFhhyQykCflHj7EgXcljGIqs9vi0IN0RpxtY4= -kmodules.xyz/resource-metadata v0.17.28 h1:zNCRy8TxuXemsKRiRqOVaCPwRJpAsvNG2KhlMq+cJdU= -kmodules.xyz/resource-metadata v0.17.28/go.mod h1:qA/yeimciDU7szGPyRT3jHDPIvm7uJiVOzcB5tIJgxE= +kmodules.xyz/resource-metadata v0.17.29 h1:bB1omnXVkN5fWOpV/0a9wEjX0JdqaS5vCYUP0LHCzKI= +kmodules.xyz/resource-metadata v0.17.29/go.mod h1:qA/yeimciDU7szGPyRT3jHDPIvm7uJiVOzcB5tIJgxE= kmodules.xyz/resource-metrics v0.25.7 h1:ne2cK/dlnfYcuu0+pHX15Y53rcKBQq9DuCtQVcx6rY8= kmodules.xyz/resource-metrics v0.25.7/go.mod h1:y7pDmTWuVLNGSjwckKCwJFhCgi5fhbwS7PAcH2rmGcY= kmodules.xyz/sets v0.25.0 h1:belY/3trp/M/CKc1TEteA40jb2uCIdwKHhjpvrIxG+8= diff --git a/pkg/registry/meta/clusterstatus/fluxcd.go b/pkg/registry/meta/clusterstatus/fluxcd.go index 4f0cc8efe..4b5bbf4d9 100644 --- a/pkg/registry/meta/clusterstatus/fluxcd.go +++ b/pkg/registry/meta/clusterstatus/fluxcd.go @@ -23,13 +23,10 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime/schema" + rsapi "kmodules.xyz/resource-metadata/apis/meta/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/client" ) -const ( - KeyACEManaged = "byte.builders/managed" -) - type FluxCDStatus struct { Installed bool `json:"installed"` Ready bool `json:"ready"` @@ -86,7 +83,7 @@ func getFluxCDStatus(kc client.Client) (FluxCDStatus, error) { } func isFluxCDManaged(podLabels map[string]string) bool { - _, exists := podLabels[KeyACEManaged] + _, exists := podLabels[rsapi.KeyACEManaged] return exists } diff --git a/vendor/go.bytebuilders.dev/license-verifier/info/lib.go b/vendor/go.bytebuilders.dev/license-verifier/info/lib.go index ece54d838..060595e63 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/info/lib.go +++ b/vendor/go.bytebuilders.dev/license-verifier/info/lib.go @@ -47,8 +47,9 @@ var ( ProductName string // This has been renamed to Features ProductUID string - ProdDomain = "byte.builders" - QADomain = "appscode.ninja" + QADomain = "appscode.ninja" + ProdDomain = "appscode.com" + DeprecatedProdDomain = "byte.builders" registrationAPIPath = "api/v1/register" LicenseIssuerAPIPath = "api/v1/license/issue" @@ -143,8 +144,10 @@ func HostedEndpoint(u string) (bool, error) { func HostedDomain(d string) bool { return d == ProdDomain || + d == DeprecatedProdDomain || d == QADomain || strings.HasSuffix(d, "."+ProdDomain) || + strings.HasSuffix(d, "."+DeprecatedProdDomain) || strings.HasSuffix(d, "."+QADomain) } diff --git a/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/clusterstatus_types.go b/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/clusterstatus_types.go index 29a844e22..d7be93aea 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/clusterstatus_types.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/clusterstatus_types.go @@ -28,6 +28,10 @@ const ( ResourceClusterStatuses = "clusterstatuses" ) +const ( + KeyACEManaged = "ace.appscode.com/managed" +) + // ClusterStatus is the Schema for any resource supported by resource-metrics library // +genclient diff --git a/vendor/modules.txt b/vendor/modules.txt index 863dcc16d..d9ae16775 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -718,7 +718,7 @@ github.com/yudai/golcs # github.com/zeebo/xxh3 v1.0.2 ## explicit; go 1.17 github.com/zeebo/xxh3 -# go.bytebuilders.dev/license-verifier v0.13.3 +# go.bytebuilders.dev/license-verifier v0.13.4 ## explicit; go 1.18 go.bytebuilders.dev/license-verifier/apis/licenses go.bytebuilders.dev/license-verifier/info @@ -1839,7 +1839,7 @@ kmodules.xyz/monitoring-agent-api/client # kmodules.xyz/offshoot-api v0.25.4 ## explicit; go 1.18 kmodules.xyz/offshoot-api/api/v1 -# kmodules.xyz/resource-metadata v0.17.28 +# kmodules.xyz/resource-metadata v0.17.29 ## explicit; go 1.18 kmodules.xyz/resource-metadata/apis/core/install kmodules.xyz/resource-metadata/apis/core/v1alpha1