Skip to content

Commit

Permalink
Update dependencies to publish SiteInfo (#369)
Browse files Browse the repository at this point in the history 
Signed-off-by: 1gtm <1gtm@appscode.com>
  • Loading branch information
@1gtm
1gtm committed Oct 7, 2021
1 parent a1cc057 commit df91337
Show file tree
Hide file tree
Showing 7 changed files with 291 additions and 124 deletions.
6 changes: 4 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/Masterminds/semver/v3 v3.1.1
github.com/Masterminds/sprig/v3 v3.2.2
github.com/gobuffalo/flect v0.2.3 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.2.0
github.com/spf13/pflag v1.0.5
github.com/yudai/gojsondiff v1.0.0
Expand All @@ -15,7 +15,7 @@ require (
gomodules.xyz/semvers v0.0.0-20210603205601-45dfbb5326a4
k8s.io/api v0.21.1
k8s.io/apimachinery v0.21.1
kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32
kmodules.xyz/client-go v0.0.0-20210928133955-8df5bb467db6
kmodules.xyz/schema-checker v0.1.3
sigs.k8s.io/yaml v1.2.0
stash.appscode.dev/installer v0.12.2-0.20211007063844-5e8dc3cd6620
Expand Down Expand Up @@ -128,3 +128,5 @@ replace k8s.io/utils => k8s.io/utils v0.0.0-20201110183641-67b214c5f920
replace sigs.k8s.io/application => github.com/kmodules/application v0.8.4-0.20210427030912-90eeee3bc4ad

replace github.com/satori/go.uuid => github.com/gofrs/uuid v4.0.0+incompatible

replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt v3.2.1+incompatible
9 changes: 5 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4a
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
Expand Down Expand Up @@ -145,6 +144,7 @@ github.com/gobuffalo/flect v0.2.3/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20j
github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
Expand All @@ -165,8 +165,8 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
Expand Down Expand Up @@ -689,8 +689,9 @@ k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
k8s.io/kube-aggregator v0.21.1/go.mod h1:cAZ0n02IiSl57sQSHz4vvrz3upQRMbytOiZnpPJaQzQ=
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32 h1:ZXVJStHHjppRoaUw5JQ5KzMjK+EiY1GkcPigPHfkvSg=
kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA=
kmodules.xyz/client-go v0.0.0-20210928133955-8df5bb467db6 h1:o+SymmN26C8bqh1nLTFjT0UdOtAYrTLbp6v49iRe5MY=
kmodules.xyz/client-go v0.0.0-20210928133955-8df5bb467db6/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA=
kmodules.xyz/schema-checker v0.1.2/go.mod h1:JyT3tjizU/gQY9bK56xzAvkjJoAaUPRam7HELx4Nb/o=
kmodules.xyz/schema-checker v0.1.3 h1:FkqRUfAyqtH0ZwJ0DLc0hT6bvqSFl908crj1qr+gBbQ=
kmodules.xyz/schema-checker v0.1.3/go.mod h1:mp0Y2dChcsE7Ws0BcV4OmpdeD9ZB2NgUrGnqeZdfr4o=
Expand Down
98 changes: 49 additions & 49 deletions hack/fmt/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func main() {
flag.CommandLine.AddGoFlagSet(goflag.CommandLine)
flag.Parse()

resources, err := parser.ListDirResources(filepath.Join(dir, "catalog", "raw"))
resources, err := parser.ListPathResources(filepath.Join(dir, "catalog", "raw"))
if err != nil {
panic(err)
}
Expand All @@ -149,40 +149,40 @@ func main() {
}
}

for _, obj := range resources {
for _, ri := range resources {
// remove labels
obj.SetNamespace("")
obj.SetLabels(nil)
obj.SetAnnotations(nil)
ri.Object.SetNamespace("")
ri.Object.SetLabels(nil)
ri.Object.SetAnnotations(nil)

for jp, val := range specUpdates {
if apiKind == "" || apiKind == obj.GetKind() {
if _, ok, _ := unstructured.NestedFieldNoCopy(obj.Object, strings.Split(jp, ".")...); ok {
err = unstructured.SetNestedField(obj.Object, val, strings.Split(jp, ".")...)
if apiKind == "" || apiKind == ri.Object.GetKind() {
if _, ok, _ := unstructured.NestedFieldNoCopy(ri.Object.Object, strings.Split(jp, ".")...); ok {
err = unstructured.SetNestedField(ri.Object.Object, val, strings.Split(jp, ".")...)
if err != nil {
panic(fmt.Sprintf("failed to set %s to %s in group=%s,kind=%s,name=%s", jp, val, obj.GetAPIVersion(), obj.GetKind(), obj.GetName()))
panic(fmt.Sprintf("failed to set %s to %s in group=%s,kind=%s,name=%s", jp, val, ri.Object.GetAPIVersion(), ri.Object.GetKind(), ri.Object.GetName()))
}
}
}
}

gv, err := schema.ParseGroupVersion(obj.GetAPIVersion())
gv, err := schema.ParseGroupVersion(ri.Object.GetAPIVersion())
if err != nil {
panic(err)
}
if gv.Group == "catalog.kubedb.com" {
dbKind := strings.TrimSuffix(obj.GetKind(), "Version")
deprecated, _, _ := unstructured.NestedBool(obj.Object, "spec", "deprecated")
dbKind := strings.TrimSuffix(ri.Object.GetKind(), "Version")
deprecated, _, _ := unstructured.NestedBool(ri.Object.Object, "spec", "deprecated")

distro, _, _ := unstructured.NestedString(obj.Object, "spec", "distribution")
distro, _, _ := unstructured.NestedString(ri.Object.Object, "spec", "distribution")
if dbKind == "Elasticsearch" {
authPlugin, _, _ := unstructured.NestedString(obj.Object, "spec", "authPlugin")
authPlugin, _, _ := unstructured.NestedString(ri.Object.Object, "spec", "authPlugin")
if distro == "" {
distro = authPlugin
if authPlugin == "X-Pack" {
distro = "ElasticStack"
}
err = unstructured.SetNestedField(obj.Object, distro, "spec", "distribution")
err = unstructured.SetNestedField(ri.Object.Object, distro, "spec", "distribution")
if err != nil {
panic(err)
}
Expand All @@ -191,58 +191,58 @@ func main() {
if distro == "" {

distro = "PostgreSQL"
if strings.Contains(strings.ToLower(obj.GetName()), "timescale") {
if strings.Contains(strings.ToLower(ri.Object.GetName()), "timescale") {
distro = "TimescaleDB"
}
err = unstructured.SetNestedField(obj.Object, distro, "spec", "distribution")
err = unstructured.SetNestedField(ri.Object.Object, distro, "spec", "distribution")
if err != nil {
panic(err)
}
}
} else if dbKind == "MySQL" {
if distro == "" {
distro = "Oracle"
if strings.Contains(strings.ToLower(obj.GetName()), "percona") {
if strings.Contains(strings.ToLower(ri.Object.GetName()), "percona") {
distro = "Percona"
}
err = unstructured.SetNestedField(obj.Object, distro, "spec", "distribution")
err = unstructured.SetNestedField(ri.Object.Object, distro, "spec", "distribution")
if err != nil {
panic(err)
}
}
} else if dbKind == "MongoDB" {
if distro == "" {
distro = "MongoDB"
if strings.Contains(strings.ToLower(obj.GetName()), "percona") {
if strings.Contains(strings.ToLower(ri.Object.GetName()), "percona") {
distro = "Percona"
}
err = unstructured.SetNestedField(obj.Object, distro, "spec", "distribution")
err = unstructured.SetNestedField(ri.Object.Object, distro, "spec", "distribution")
if err != nil {
panic(err)
}
}
}

dbVersion, _, err := unstructured.NestedString(obj.Object, "spec", "version")
dbVersion, _, err := unstructured.NestedString(ri.Object.Object, "spec", "version")
if err != nil {
panic(err)
}
dbverKey := DbVersion{
Group: gv.Group,
Kind: obj.GetKind(),
Kind: ri.Object.GetKind(),
Version: dbVersion,
Distro: distro,
}
dbStore[dbverKey] = append(dbStore[dbverKey], obj)
dbStore[dbverKey] = append(dbStore[dbverKey], ri.Object)

pspName, _, err := unstructured.NestedString(obj.Object, "spec", "podSecurityPolicies", "databasePolicyName")
pspName, _, err := unstructured.NestedString(ri.Object.Object, "spec", "podSecurityPolicies", "databasePolicyName")
if err != nil {
panic(err)
}
if pspName != "" {
dbKey := DB{
Group: gv.Group,
Kind: obj.GetKind(),
Kind: ri.Object.GetKind(),
}
if _, ok := pspForDBs[dbKey]; !ok {
pspForDBs[dbKey] = sets.NewString()
Expand All @@ -253,10 +253,10 @@ func main() {
if !deprecated {
activeDBVersions[dbKind] = append(activeDBVersions[dbKind], FullVersion{
Version: dbVersion,
CatalogName: obj.GetName(),
CatalogName: ri.Object.GetName(),
})

backupTask, _, _ := unstructured.NestedString(obj.Object, "spec", "stash", "addon", "backupTask", "name")
backupTask, _, _ := unstructured.NestedString(ri.Object.Object, "spec", "stash", "addon", "backupTask", "name")
if backupTask != "" {
// update based on stash catalog
addonKey := StashAddon{
Expand All @@ -268,13 +268,13 @@ func main() {
panic(fmt.Sprintf("no backup addon found for %#v", addonKey))
}
backupTask = fmt.Sprintf("%s-backup-%s", addonKey.DBType, addVer)
err = unstructured.SetNestedField(obj.Object, backupTask, "spec", "stash", "addon", "backupTask", "name")
err = unstructured.SetNestedField(ri.Object.Object, backupTask, "spec", "stash", "addon", "backupTask", "name")
if err != nil {
panic(err)
}
backupTaskStore[backupTask] = append(backupTaskStore[backupTask], obj.GetName())
backupTaskStore[backupTask] = append(backupTaskStore[backupTask], ri.Object.GetName())
}
restoreTask, _, _ := unstructured.NestedString(obj.Object, "spec", "stash", "addon", "restoreTask", "name")
restoreTask, _, _ := unstructured.NestedString(ri.Object.Object, "spec", "stash", "addon", "restoreTask", "name")
if restoreTask != "" {
// update based on stash catalog
addonKey := StashAddon{
Expand All @@ -286,18 +286,18 @@ func main() {
panic(fmt.Sprintf("no restore addon found for %#v", addonKey))
}
restoreTask = fmt.Sprintf("%s-restore-%s", addonKey.DBType, addVer)
err = unstructured.SetNestedField(obj.Object, restoreTask, "spec", "stash", "addon", "restoreTask", "name")
err = unstructured.SetNestedField(ri.Object.Object, restoreTask, "spec", "stash", "addon", "restoreTask", "name")
if err != nil {
panic(err)
}
restoreTaskStore[restoreTask] = append(restoreTaskStore[restoreTask], obj.GetName())
restoreTaskStore[restoreTask] = append(restoreTaskStore[restoreTask], ri.Object.GetName())
}
}
} else if gv.Group == "policy" {
if _, ok := pspStore[obj.GetName()]; ok {
panic("duplicate PSP name " + obj.GetName())
if _, ok := pspStore[ri.Object.GetName()]; ok {
panic("duplicate PSP name " + ri.Object.GetName())
}
pspStore[obj.GetName()] = obj
pspStore[ri.Object.GetName()] = ri.Object
}
}

Expand Down Expand Up @@ -623,13 +623,13 @@ func main() {
}

dm := map[ObjectKey]*DiffData{}
for _, obj := range resources {
for _, ri := range resources {
dm[ObjectKey{
APIVersion: obj.GetAPIVersion(),
Kind: obj.GetKind(),
Name: obj.GetName(),
APIVersion: ri.Object.GetAPIVersion(),
Kind: ri.Object.GetKind(),
Name: ri.Object.GetName(),
}] = &DiffData{
A: obj,
A: ri.Object,
}
}

Expand All @@ -650,21 +650,21 @@ func main() {
panic(err)
}

for _, obj := range helmout {
obj.SetNamespace("")
obj.SetLabels(nil)
obj.SetAnnotations(nil)
for _, ri := range helmout {
ri.Object.SetNamespace("")
ri.Object.SetLabels(nil)
ri.Object.SetAnnotations(nil)

key := ObjectKey{
APIVersion: obj.GetAPIVersion(),
Kind: obj.GetKind(),
Name: obj.GetName(),
APIVersion: ri.Object.GetAPIVersion(),
Kind: ri.Object.GetKind(),
Name: ri.Object.GetName(),
}
if _, ok := dm[key]; !ok {
failed = true
_, _ = fmt.Fprintf(os.Stderr, "missing object is raw apiVersion=%s kind=%s name=%s", key.APIVersion, key.Kind, key.Name)
} else {
dm[key].B = obj
dm[key].B = ri.Object
}
}

Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/google/go-cmp/cmp/path.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit df91337

Please sign in to comment.