Merge branch 'hp-use-cluster-capabilities' into 'master'

Discover cluster capabilities and use them in chart

Closes #1304 and #1293

See merge request !644



Merged-by: Jason Plum <jplum@gitlab.com>
Approved-by: Jason Plum <jplum@gitlab.com>
Co-authored-by: Hossein Pursultani <hpursultani@gitlab.com>

(cherry picked from commit 3a036e8d)

7daf0b8e Discover cluster capabilities and use them in chart

controllers/settings/kube.go

@@ -3,11 +3,16 @@ package settings
 import (
 	"fmt"
 
+	"github.com/pkg/errors"
+
+	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chartutil"
+
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
@@ -90,11 +95,30 @@ func IsGroupVersionKindSupported(groupVersion, kind string) bool {
 	return false
 }
 
-func GetKubeAPIVersions() chartutil.VersionSet {
-	// To force the Helm Chart to use `networking.k8s.io/v1` Ingress objects.
-	networkingAPIVersion := "networking.k8s.io/v1/Ingress"
+func GetKubeCapabilities(actionCfg *action.Configuration) (*chartutil.Capabilities, error) {
+	dc, err := actionCfg.RESTClientGetter.ToDiscoveryClient()
+	if err != nil {
+		return nil, errors.Wrap(err, "could not get Kubernetes discovery client")
+	}
+
+	dc.Invalidate()
 
-	return chartutil.VersionSet{
-		networkingAPIVersion,
+	kubeVersion, err := dc.ServerVersion()
+	if err != nil {
+		return nil, errors.Wrap(err, "could not get server version from Kubernetes")
 	}
+
+	apiVersions, err := action.GetVersionSet(dc)
+	if err != nil && !discovery.IsGroupDiscoveryFailedError(err) {
+		return nil, errors.Wrap(err, "could not get apiVersions from Kubernetes")
+	}
+
+	return &chartutil.Capabilities{
+		APIVersions: apiVersions,
+		KubeVersion: chartutil.KubeVersion{
+			Version: kubeVersion.GitVersion,
+			Major:   kubeVersion.Major,
+			Minor:   kubeVersion.Minor,
+		},
+	}, nil
 }

controllers/settings/settings.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"strings"
 
 	"helm.sh/helm/v3/pkg/chartutil"
 )
@@ -54,7 +55,8 @@ var (
 	HealthzCheck = func(_ *http.Request) error { return AliveStatus }
 	ReadyzCheck  = func(_ *http.Request) error { return ReadyStatus }
 
-	KubeVersion *chartutil.KubeVersion = nil
+	DefaultKubeVersion     *chartutil.KubeVersion = nil
+	DefaultKubeAPIVersions chartutil.VersionSet   = chartutil.VersionSet{}
 )
 
 const (
@@ -64,6 +66,7 @@ const (
 	envAppNonRootServiceAccount = "GITLAB_APP_NONROOT_SERVICE_ACCOUNT"
 	envNGINXServiceAccount      = "NGINX_SERVICE_ACCOUNT"
 	envKubeVersion              = "GITLAB_OPERATOR_KUBERNETES_VERSION"
+	envKubeAPIVersions          = "GITLAB_OPERATOR_KUBERNETES_API_VERSIONS"
 )
 
 // Load reads Operator settings from environment variables.
@@ -95,6 +98,11 @@ func Load() {
 
 	kubeVersionStr := os.Getenv(envKubeVersion)
 	if kubeVersionStr != "" {
-		KubeVersion, _ = chartutil.ParseKubeVersion(kubeVersionStr)
+		DefaultKubeVersion, _ = chartutil.ParseKubeVersion(kubeVersionStr)
+	}
+
+	kubeAPIVersionsStr := os.Getenv(envKubeAPIVersions)
+	if kubeAPIVersionsStr != "" {
+		DefaultKubeAPIVersions = strings.Split(kubeAPIVersionsStr, ",")
 	}
 }

helm/builder.go

@@ -4,10 +4,12 @@ import (
 	"fmt"
 
 	"github.com/pkg/errors"
+
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chart"
 	"helm.sh/helm/v3/pkg/cli"
 	"helm.sh/helm/v3/pkg/releaseutil"
+
 	"k8s.io/kubectl/pkg/scheme"
 
 	"gitlab.com/gitlab-org/cloud-native/gitlab-operator/controllers/settings"
@@ -63,12 +65,20 @@ func NewBuilder(charts charts.Catalog) (Builder, error) {
 		return nil, err
 	}
 
+	kubeVersion := settings.DefaultKubeVersion
+	kubeAPIVersions := settings.DefaultKubeAPIVersions
+
+	if capabilities, err := settings.GetKubeCapabilities(actionConfig); err == nil {
+		kubeVersion = &capabilities.KubeVersion
+		kubeAPIVersions = capabilities.APIVersions
+	}
+
 	client := action.NewInstall(actionConfig)
 	client.DryRun = true
 	client.Replace = true
 	client.ClientOnly = true
-	client.KubeVersion = settings.KubeVersion
-	client.APIVersions = settings.GetKubeAPIVersions()
+	client.KubeVersion = kubeVersion
+	client.APIVersions = kubeAPIVersions
 
 	chart := charts.First()