Merge pull request #31920 from SergioChan/backport-fix-empty-crd-resources-31552

fix(action): guard nil RESTClientGetter in CRD install path (dev-v3)

pkg/action/install.go

@@ -186,6 +186,7 @@ func (i *Install) installCRDs(crds []chart.CRD) error {
 			return err
 		}
 
+		if i.cfg.RESTClientGetter != nil {
 			// If we have already gathered the capabilities, we need to invalidate
 			// the cache so that the new CRDs are recognized. This should only be
 			// the case when an action configuration is reused for multiple actions,
@@ -196,12 +197,12 @@ func (i *Install) installCRDs(crds []chart.CRD) error {
 				if err != nil {
 					return err
 				}
-
+				if discoveryClient != nil {
 					i.cfg.Log("Clearing discovery cache")
 					discoveryClient.Invalidate()
-
 					_, _ = discoveryClient.ServerGroups()
 				}
+			}
 
 			// Invalidate the REST mapper, since it will not have the new CRDs
 			// present.
@@ -214,6 +215,7 @@ func (i *Install) installCRDs(crds []chart.CRD) error {
 				resettable.Reset()
 			}
 		}
+	}
 	return nil
 }
 

pkg/action/install_test.go

@@ -894,6 +894,28 @@ func TestNameAndChartGenerateName(t *testing.T) {
 	}
 }
 
+func TestInstallCRDsWithNilRESTClientGetter(t *testing.T) {
+	config := actionConfigFixture(t)
+	failingKubeClient := kubefake.FailingKubeClient{PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard}, BuildDummy: true}
+	config.KubeClient = &failingKubeClient
+	config.RESTClientGetter = nil
+	instAction := NewInstall(config)
+
+	crds := []chart.CRD{{
+		Name: "test-crd",
+		File: &chart.File{
+			Name: "crds/test-crd.yaml",
+			Data: []byte("kind: CustomResourceDefinition"),
+		},
+	}}
+
+	var err error
+	require.NotPanics(t, func() {
+		err = instAction.installCRDs(crds)
+	})
+	require.NoError(t, err)
+}
+
 func TestInstallWithLabels(t *testing.T) {
 	is := assert.New(t)
 	instAction := installAction(t)