Skip to content

Commit

Permalink
adjust variable name to correct overlap with package of same name.
Browse files Browse the repository at this point in the history
  • Loading branch information
mallardduck committed Apr 10, 2024
1 parent bc3fb4e commit 9c62940
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions pkg/crds/crd.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,25 @@ func WriteCRD() error {
return err
}
newObj, _ := bCrd.(*unstructured.Unstructured)
var crd apiext.CustomResourceDefinition
if err := runtime.DefaultUnstructuredConverter.FromUnstructured(newObj.Object, &crd); err != nil {
var crdItem apiext.CustomResourceDefinition
if err := runtime.DefaultUnstructuredConverter.FromUnstructured(newObj.Object, &crdItem); err != nil {
return err
}
switch crd.Name {
switch crdItem.Name {
case "backups.resources.cattle.io":
customizeBackup(&crd)
customizeBackup(&crdItem)
case "resourcesets.resources.cattle.io":
customizeResourceSet(&crd)
customizeResourceSet(&crdItem)
case "restores.resources.cattle.io":
customizeRestore(&crd)
customizeRestore(&crdItem)
}

yamlBytes, err := yaml.Export(&crd)
yamlBytes, err := yaml.Export(&crdItem)
if err != nil {
return err
}

filename := fmt.Sprintf("./charts/rancher-backup-crd/templates/%s.yaml", strings.ToLower(crd.Spec.Names.Kind))
filename := fmt.Sprintf("./charts/rancher-backup-crd/templates/%s.yaml", strings.ToLower(crdItem.Spec.Names.Kind))
err = ioutil.WriteFile(filename, yamlBytes, 0644)
if err != nil {
return err
Expand Down Expand Up @@ -128,7 +128,7 @@ func customizeRestore(restore *apiext.CustomResourceDefinition) {
}

func newCRD(obj interface{}, customize func(crd.CRD) crd.CRD) crd.CRD {
crd := crd.CRD{
crdItem := crd.CRD{
GVK: schema.GroupVersionKind{
Group: "resources.cattle.io",
Version: "v1",
Expand All @@ -138,7 +138,7 @@ func newCRD(obj interface{}, customize func(crd.CRD) crd.CRD) crd.CRD {
NonNamespace: true,
}
if customize != nil {
crd = customize(crd)
crdItem = customize(crdItem)
}
return crd
return crdItem
}

0 comments on commit 9c62940

Please sign in to comment.