Merge pull request #35 from burmanm/debug_logging_crd_upgrade

Modify YAML parsing to parse multiple documents per file

cmd/kubectl-k8ssandra/helm/crds.go

@@ -4,6 +4,7 @@ import (
  "context"
  "fmt"
 
+ "github.com/charmbracelet/log"
  "github.com/k8ssandra/k8ssandra-client/pkg/helmutil"
  "github.com/k8ssandra/k8ssandra-client/pkg/kubernetes"
  "github.com/spf13/cobra"
@@ -56,6 +57,7 @@ func NewUpgradeCmd(streams genericclioptions.IOStreams) *cobra.Command {
  return err
  }
  if err := o.Run(); err != nil {
+ log.Error("Error upgrading CustomResourceDefinitions", "error", err)
  return err
  }
 

go.mod

@@ -7,14 +7,15 @@ require (
  github.com/burmanm/definitions-parser v0.0.0-20230720114634-62c738b72e61
  github.com/charmbracelet/bubbles v0.16.1
  github.com/charmbracelet/bubbletea v0.24.2
- github.com/charmbracelet/lipgloss v0.7.1
+ github.com/charmbracelet/lipgloss v0.10.0
+ github.com/charmbracelet/log v0.4.0
  github.com/google/uuid v1.3.0
  github.com/k8ssandra/cass-operator v1.19.1-0.20240307065059-c273e274310b
  github.com/k8ssandra/k8ssandra-operator v1.9.2
  github.com/pkg/errors v0.9.1
  github.com/spf13/cobra v1.8.0
  github.com/spf13/pflag v1.0.5
- github.com/stretchr/testify v1.8.4
+ github.com/stretchr/testify v1.9.0
  gopkg.in/yaml.v3 v3.0.1
  helm.sh/helm/v3 v3.14.2
  k8s.io/api v0.29.0
@@ -66,6 +67,7 @@ require (
  github.com/fvbommel/sortorder v1.1.0 // indirect
  github.com/go-errors/errors v1.4.2 // indirect
  github.com/go-gorp/gorp/v3 v3.1.0 // indirect
+ github.com/go-logfmt/logfmt v0.6.0 // indirect
  github.com/go-logr/logr v1.4.1 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
  github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -102,7 +104,7 @@ require (
  github.com/mattn/go-colorable v0.1.13 // indirect
  github.com/mattn/go-isatty v0.0.18 // indirect
  github.com/mattn/go-localereader v0.0.1 // indirect
- github.com/mattn/go-runewidth v0.0.14 // indirect
+ github.com/mattn/go-runewidth v0.0.15 // indirect
  github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
  github.com/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -117,7 +119,7 @@ require (
  github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
  github.com/muesli/cancelreader v0.2.2 // indirect
  github.com/muesli/reflow v0.3.0 // indirect
- github.com/muesli/termenv v0.15.1 // indirect
+ github.com/muesli/termenv v0.15.2 // indirect
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
  github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
  github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -128,7 +130,7 @@ require (
  github.com/prometheus/client_model v0.5.0 // indirect
  github.com/prometheus/common v0.45.0 // indirect
  github.com/prometheus/procfs v0.12.0 // indirect
- github.com/rivo/uniseg v0.2.0 // indirect
+ github.com/rivo/uniseg v0.4.7 // indirect
  github.com/rubenv/sql-migrate v1.5.2 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/shopspring/decimal v1.3.1 // indirect
@@ -144,7 +146,7 @@ require (
  go.opentelemetry.io/otel/trace v1.19.0 // indirect
  go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
  golang.org/x/crypto v0.17.0 // indirect
- golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+ golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
  golang.org/x/mod v0.14.0 // indirect
  golang.org/x/net v0.19.0 // indirect
  golang.org/x/oauth2 v0.12.0 // indirect

go.sum

@@ -64,8 +64,10 @@ github.com/charmbracelet/bubbles v0.16.1 h1:6uzpAAaT9ZqKssntbvZMlksWHruQLNxg49H5
 github.com/charmbracelet/bubbles v0.16.1/go.mod h1:2QCp9LFlEsBQMvIYERr7Ww2H2bA7xen1idUDIzm/+Xc=
 github.com/charmbracelet/bubbletea v0.24.2 h1:uaQIKx9Ai6Gdh5zpTbGiWpytMU+CfsPp06RaW2cx/SY=
 github.com/charmbracelet/bubbletea v0.24.2/go.mod h1:XdrNrV4J8GiyshTtx3DNuYkR1FDaJmO3l2nejekbsgg=
-github.com/charmbracelet/lipgloss v0.7.1 h1:17WMwi7N1b1rVWOjMT+rCh7sQkvDU75B2hbZpc5Kc1E=
-github.com/charmbracelet/lipgloss v0.7.1/go.mod h1:yG0k3giv8Qj8edTCbbg6AlQ5e8KNWpFujkNawKNhE2c=
+github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s=
+github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE=
+github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
+github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -140,6 +142,8 @@ github.com/go-gorp/gorp/v3 v3.1.0/go.mod h1:dLEjIyyRNiXvNZ8PSmzpt1GsWAUK8kjVhEpj
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
+github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
@@ -294,8 +298,8 @@ github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
 github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
 github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
-github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
 github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
@@ -337,8 +341,8 @@ github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELU
 github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
 github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
-github.com/muesli/termenv v0.15.1 h1:UzuTb/+hhlBugQz28rpzey4ZuKcZ03MeKsoG7IJZIxs=
-github.com/muesli/termenv v0.15.1/go.mod h1:HeAQPTzpfs016yGtA4g00CsdYnVLJvxsS4ANqrZs2sQ=
+github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
+github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -383,8 +387,9 @@ github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rubenv/sql-migrate v1.5.2 h1:bMDqOnrJVV/6JQgQ/MxOpU+AdO8uzYYA/TxFUBzFtS0=
@@ -409,17 +414,18 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -465,8 +471,8 @@ golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4
 golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=

pkg/helmutil/crds.go

@@ -5,10 +5,12 @@ import (
  "bytes"
  "context"
  "fmt"
+ "io"
  "os"
  "path/filepath"
  "strings"
 
+ "github.com/charmbracelet/log"
  "github.com/pkg/errors"
  apierrors "k8s.io/apimachinery/pkg/api/errors"
  "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -38,12 +40,15 @@ func NewUpgrader(c client.Client, repoName, repoURL, chartName string) (*Upgrade
 
 // Upgrade installs the missing CRDs or updates them if they exists already
 func (u *Upgrader) Upgrade(ctx context.Context, chartVersion string) ([]unstructured.Unstructured, error) {
+ log.SetLevel(log.DebugLevel)
+ log.Info("Processing request to upgrade project CustomResourceDefinitions", "repoName", u.repoName, "chartName", u.chartName, "chartVersion", chartVersion)
  chartDir, err := GetChartTargetDir(u.repoName, u.chartName)
  if err != nil {
  return nil, err
  }
 
- if _, err := os.Stat(chartDir); os.IsNotExist(err) {
+ if fs, err := os.Stat(chartDir); os.IsNotExist(err) {
+ log.Info("Downloading chart release from remote repository", "repoURL", u.repoURL, "chartName", u.chartName, "chartVersion", chartVersion)
  downloadDir, err := DownloadChartRelease(u.repoName, u.repoURL, u.chartName, chartVersion)
  if err != nil {
  return nil, err
@@ -54,34 +59,43 @@ func (u *Upgrader) Upgrade(ctx context.Context, chartVersion string) ([]unstruct
  return nil, err
  }
  chartDir = extractDir
+ } else if err != nil {
+ log.Error("Failed to check chart release directory", "error", err)
+ return nil, err
+ } else if !fs.IsDir() {
+ err := fmt.Errorf("chart release is not a directory: %s", chartDir)
+ log.Error("Target chart release path is not a directory", "directory", chartDir, "error", err)
+ return nil, err
  } else {
- fmt.Printf("Using cached chart release from %s\n", chartDir)
+ log.Info("Using cached chart release", "directory", chartDir)
  }
 
- // defer os.RemoveAll(downloadDir)
-
  crds := make([]unstructured.Unstructured, 0)
 
  // For each dir under the charts subdir, check the "crds/"
  paths, _ := findCRDDirs(chartDir)
 
  for _, path := range paths {
+ log.Debug("Processing CustomResourceDefinition directory", "path", path)
  err = parseChartCRDs(&crds, path)
  if err != nil {
  return nil, err
  }
  }
 
  for _, obj := range crds {
+ log.Info("Processing CustomResourceDefinition", "name", obj.GetName())
  existingCrd := obj.DeepCopy()
  err = u.client.Get(ctx, client.ObjectKey{Name: obj.GetName()}, existingCrd)
  if apierrors.IsNotFound(err) {
+ log.Debug("Creating CustomResourceDefinition", "name", obj.GetName())
  if err = u.client.Create(ctx, &obj); err != nil {
  return nil, errors.Wrapf(err, "failed to create CRD %s", obj.GetName())
  }
  } else if err != nil {
  return nil, errors.Wrapf(err, "failed to fetch state of %s", obj.GetName())
  } else {
+ log.Debug("Updating CustomResourceDefinition", "name", obj.GetName())
  obj.SetResourceVersion(existingCrd.GetResourceVersion())
  if err = u.client.Update(ctx, &obj); err != nil {
  return nil, errors.Wrapf(err, "failed to update CRD %s", obj.GetName())
@@ -112,6 +126,7 @@ func findCRDDirs(chartDir string) ([]string, error) {
 func parseChartCRDs(crds *[]unstructured.Unstructured, crdDir string) error {
  errOuter := filepath.Walk(crdDir, func(path string, info os.FileInfo, err error) error {
  if err != nil {
+ log.Error("Error parsing CustomResourceDefinition directory", "path", path, "error", err)
  return err
  }
 
@@ -120,38 +135,64 @@ func parseChartCRDs(crds *[]unstructured.Unstructured, crdDir string) error {
  }
 
  // Add to CRDs ..
+ log.Debug("Parsing CustomResourceDefinition file", "path", path)
  b, err := os.ReadFile(path)
  if err != nil {
+ log.Error("Failed to read CustomResourceDefinition file", "path", path, "error", err)
  return err
  }
 
  if len(b) == 0 {
+ log.Warn("Empty CustomResourceDefinition file", "path", path)
  return nil
  }
 
- reader := k8syaml.NewYAMLReader(bufio.NewReader(bytes.NewReader(b)))
- doc, err := reader.Read()
+ docs, err := parseCRDYamls(b)
  if err != nil {
+ log.Error("Failed to parse YAML CustomResourceDefinition file", "path", path, "error", err)
  return err
  }
+ dec := deser.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
 
- crd := unstructured.Unstructured{}
+ for _, b := range docs {
+ crd := unstructured.Unstructured{}
 
- dec := deser.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
+ _, gvk, err := dec.Decode(b, nil, &crd)
+ if err != nil {
+ log.Error("Failed to decode CustomResourceDefinition", "path", path, "error", err)
+ continue
+ }
 
- _, gvk, err := dec.Decode(doc, nil, &crd)
- if err != nil {
- return nil
- }
+  if gvk.Kind != "CustomResourceDefinition" {
+  log.Error("File is not a CustomResourceDefinition", "path", path, "kind", gvk.Kind)
+  continue
+  }
 
- if gvk.Kind != "CustomResourceDefinition" {
- return nil
+ *crds = append(*crds, crd)
  }
 
- *crds = append(*crds, crd)
-
- return nil
+ return err
  })
 
  return errOuter
 }
+
+func parseCRDYamls(b []byte) ([][]byte, error) {
+ docs := [][]byte{}
+ reader := k8syaml.NewYAMLReader(bufio.NewReader(bytes.NewReader(b)))
+ for {
+ // Read document
+ doc, err := reader.Read()
+ if err != nil {
+ if err == io.EOF {
+ break
+ }
+
+ return nil, err
+ }
+
+ docs = append(docs, doc)
+ }
+
+ return docs, nil
+}

pkg/helmutil/crds_unit_test.go

@@ -0,0 +1,34 @@
+package helmutil
+
+import (
+ "os"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+)
+
+func TestFindCRDDirs(t *testing.T) {
+ require := require.New(t)
+ chartDir, err := os.MkdirTemp("", "k8ssandra")
+ defer os.RemoveAll(chartDir)
+ require.NoError(err)
+
+ require.NoError(os.MkdirAll(chartDir+"/downstream-operator/crds", 0755))
+
+ dirs, err := findCRDDirs(chartDir)
+ require.NoError(err)
+
+ require.Len(dirs, 1)
+ require.Equal(chartDir+"/downstream-operator/crds", dirs[0])
+
+ require.NoError(os.MkdirAll(chartDir+"/downstream-operator/charts/k8ssandra-operator/crds", 0755))
+ require.NoError(os.MkdirAll(chartDir+"/downstream-operator/charts/k8ssandra-operator/charts/cass-operator/crds", 0755))
+
+ dirs, err = findCRDDirs(chartDir)
+ require.NoError(err)
+
+ require.Len(dirs, 3)
+ require.Contains(dirs, chartDir+"/downstream-operator/crds")
+ require.Contains(dirs, chartDir+"/downstream-operator/charts/k8ssandra-operator/crds")
+ require.Contains(dirs, chartDir+"/downstream-operator/charts/k8ssandra-operator/charts/cass-operator/crds")
+}