Merge branch 'main' into sheidkamp/deprecate-graphql

Author: sam-heilbron

.github/workflows/pr-unit-tests.yaml

@@ -6,6 +6,9 @@ name: Unit Tests
 #
 # Our historical unit tests are run via CloudBuild
 # Overtime, it would be valuable to consolidate these approaches
+env:
+  VERSION: '1.0.0-ci1'
+  GITHUB_TOKEN: ${{ github.token }}
 
 on:
   pull_request:

changelog/v1.18.0-beta35/bump-kubectl-image.yaml

@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/solo-io/gloo-mesh-enterprise/issues/19119
+    resolvesIssue: false
+    description: >-
+      Bump the kubectl image from 1.29.6 to to 1.31.1 to address CVE-2023-45288.

changelog/v1.18.0-beta35/crdcheck.yaml

@@ -0,0 +1,4 @@
+changelog:
+  - type: NON_USER_FACING
+    description: >-
+      Fix CRD check to allow the group/kind to be missing.

changelog/v1.18.0-beta35/helm-doc-gen.yaml

@@ -0,0 +1,6 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/solo-projects/issues/6888
+    resolvesIssue: false
+    description: >-
+      Update helm public docs generation to work from main branch and only pull in released changes

docs/cmd/generate_docs.go

@@ -454,11 +454,9 @@ func fetchEnterpriseHelmValues(_ []string) error {
 	if err != nil {
 		return err
 	}
-	version, err := semver.NewVersion(string(semverReleaseTag))
-	if err != nil {
-		return err
-	}
-	minorReleaseTag := fmt.Sprintf("v%d.%d.x", version.Major(), version.Minor())
+
+	minorReleaseTag := "v" + string(semverReleaseTag)
+
 	files, err := githubutils.GetFilesFromGit(ctx, client, repoOwner, glooEnterpriseRepo, minorReleaseTag, path)
 	if err != nil {
 		return err

jobs/kubectl/Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 
-FROM bitnami/kubectl:1.29.6 as kubectl
+FROM bitnami/kubectl:1.31.1 as kubectl
 
 FROM $BASE_IMAGE
 

jobs/kubectl/Dockerfile.distroless

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 
-FROM bitnami/kubectl:1.29.6 as kubectl
+FROM bitnami/kubectl:1.31.1 as kubectl
 
 FROM $BASE_IMAGE
 

pkg/github-action-utils/version.go

@@ -35,7 +35,9 @@ func GetLatestEnterpriseVersion(repoRootPath string, repo string, owner string)
 		return err
 	}
 	defer f.Close()
-	enterpriseVersion, err := version.GetLatestHelmChartVersionWithMaxVersion(version.EnterpriseHelmRepoIndex, version.GlooEE, true, maxGlooEVersion)
+	// get the latest version from the helm repo, include unstable versions so it works from the main branches
+	// for LTS branches, unstable versions will be filtered out by the version constraints
+	enterpriseVersion, err := version.GetLatestHelmChartVersionWithMaxVersion(version.EnterpriseHelmRepoIndex, version.GlooEE, false, maxGlooEVersion)
 	if err != nil {
 		return err
 	}

pkg/schemes/extended_scheme.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/solo-io/gloo/projects/gateway2/wellknown"
+	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/discovery"
@@ -38,7 +39,7 @@ func CRDExists(restConfig *rest.Config, group, version, kind string) (bool, erro
 	groupVersion := fmt.Sprintf("%s/%s", group, version)
 	apiResourceList, err := discoveryClient.ServerResourcesForGroupVersion(groupVersion)
 	if err != nil {
-		if discovery.IsGroupDiscoveryFailedError(err) || meta.IsNoMatchError(err) {
+		if errors.IsNotFound(err) || discovery.IsGroupDiscoveryFailedError(err) || meta.IsNoMatchError(err) {
 			return false, nil
 		}
 		return false, err

projects/gateway2/controller/start.go

@@ -151,6 +151,8 @@ func NewControllerBuilder(ctx context.Context, cfg StartConfig) (*ControllerBuil
 		krt.WithName("AuthConfig"))
 
 	inputChannels := proxy_syncer.NewGatewayInputChannels()
+
+	setupLog.Info("initializing k8sgateway extensions")
 	k8sGwExtensions, err := cfg.ExtensionsFactory(ctx, ext.K8sGatewayExtensionsFactoryParameters{
 		Mgr:         mgr,
 		IstioClient: cfg.Client,
@@ -169,6 +171,7 @@ func NewControllerBuilder(ctx context.Context, cfg StartConfig) (*ControllerBuil
 	}
 
 	// Create the proxy syncer for the Gateway API resources
+	setupLog.Info("initializing proxy syncer")
 	proxySyncer := proxy_syncer.NewProxySyncer(
 		ctx,
 		cfg.InitialSettings,
@@ -188,7 +191,6 @@ func NewControllerBuilder(ctx context.Context, cfg StartConfig) (*ControllerBuil
 		cfg.SetupOpts.ProxyReconcileQueue,
 	)
 	proxySyncer.Init(ctx, cfg.Debugger)
-
 	if err := mgr.Add(proxySyncer); err != nil {
 		setupLog.Error(err, "unable to add proxySyncer runnable")
 		return nil, err

projects/gateway2/setup/ggv2setup.go

@@ -2,12 +2,11 @@ package setup
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sort"
 	"strings"
 
-	"errors"
-
 	"github.com/solo-io/gloo/pkg/utils/envutils"
 	"github.com/solo-io/gloo/pkg/utils/setuputils"
 	gloostatusutils "github.com/solo-io/gloo/pkg/utils/statusutils"
@@ -43,9 +42,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
-var (
-	settingsGVR = glookubev1.SchemeGroupVersion.WithResource("settings")
-)
+var settingsGVR = glookubev1.SchemeGroupVersion.WithResource("settings")
 
 func createKubeClient(restConfig *rest.Config) (istiokube.Client, error) {
 	restCfg := istiokube.NewClientConfigForRestConfig(restConfig)
@@ -77,15 +74,14 @@ func getInitialSettings(ctx context.Context, c istiokube.Client, nns types.Names
 		return nil
 	}
 	return out
-
 }
 
 func StartGGv2(ctx context.Context,
 	setupOpts *bootstrap.SetupOpts,
 	uccBuilder krtcollections.UniquelyConnectedClientsBulider,
 	extensionsFactory extensions.K8sGatewayExtensionsFactory,
-	pluginRegistryFactory func(opts registry.PluginOpts) plugins.PluginRegistryFactory) error {
-
+	pluginRegistryFactory func(opts registry.PluginOpts) plugins.PluginRegistryFactory,
+) error {
 	restConfig := ctrl.GetConfigOrDie()
 
 	return StartGGv2WithConfig(ctx, setupOpts, restConfig, uccBuilder, extensionsFactory, pluginRegistryFactory, setuputils.SetupNamespaceName())
@@ -164,6 +160,7 @@ func StartGGv2WithConfig(ctx context.Context,
 		Debugger: setupOpts.KrtDebugger,
 	})
 	if err != nil {
+		logger.Error("failed initializing controller: ", err)
 		return err
 	}
 	/// no collections after this point

test/kubernetes/testutils/helper/util_test.go

@@ -23,8 +23,8 @@ func TestReturnsLatestPatchForMinor(t *testing.T) {
 	ctx := context.Background()
 	// this is fine because this is a public repo
 	client := githubutils.GetClientWithOrWithoutToken(ctx)
-	minor, err := getLatestReleasedPatchVersion(ctx, client, "gloo", 1, 8)
+	minor, err := getLatestReleasedPatchVersion(ctx, client, "gloo", 1, 9)
 	require.NoError(t, err)
 
-	assert.Equal(t, "v1.8.37", minor.String())
+	assert.Equal(t, "v1.9.30", minor.String())
 }