Merge ceb6c401bf into a60cb79dfb

pkg/action/install.go

@@ -162,12 +162,20 @@ func (i *Install) installCRDs(crds []chart.CRD) error {
 	// We do these one file at a time in the order they were read.
 	totalItems := []*resource.Info{}
 	for _, obj := range crds {
+		if obj.File == nil {
+			return fmt.Errorf("failed to install CRD %s: file is empty", obj.Name)
+		}
+
 		// Read in the resources
 		res, err := i.cfg.KubeClient.Build(bytes.NewBuffer(obj.File.Data), false)
 		if err != nil {
 			return errors.Wrapf(err, "failed to install CRD %s", obj.Name)
 		}
 
+		if len(res) == 0 {
+			return fmt.Errorf("failed to install CRD %s: resources are empty", obj.Name)
+		}
+
 		// Send them to Kube
 		if _, err := i.cfg.KubeClient.Create(res); err != nil {
 			// If the error is CRD already exists, continue.

pkg/action/install_test.go

@@ -923,3 +923,21 @@ func TestInstallWithSystemLabels(t *testing.T) {
 
 	is.Equal(fmt.Errorf("user supplied labels contains system reserved label name. System labels: %+v", driver.GetSystemLabels()), err)
 }
+
+func TestInstallCRDs_NilFile(t *testing.T) {
+	instAction := installAction(t)
+
+	err := instAction.installCRDs([]chart.CRD{{Name: "crds/empty.yaml"}})
+	require.ErrorContains(t, err, "file is empty")
+}
+
+func TestInstallCRDs_EmptyResources(t *testing.T) {
+	config := actionConfigFixtureWithDummyResources(t, kube.ResourceList{})
+	instAction := NewInstall(config)
+
+	mockChart := buildChart()
+	mockChart.Files = append(mockChart.Files, &chart.File{Name: "crds/foo.yaml", Data: []byte("apiVersion: v1\nkind: CustomResourceDefinition\n")})
+
+	err := instAction.installCRDs(mockChart.CRDObjects())
+	require.ErrorContains(t, err, "resources are empty")
+}