Merge pull request #90 from nirmata/1.10.7-3

1.10.7 3

cmd/cli/kubectl-kyverno/jp/function/function.go

@@ -1,7 +1,9 @@
 package function
 
 import (
+	"cmp"
 	"fmt"
+	"io"
 	"strings"
 
 	"github.com/kyverno/kyverno/pkg/config"
@@ -29,27 +31,27 @@ func Command() *cobra.Command {
 		Example:      strings.Join(examples, "\n\n"),
 		SilenceUsage: true,
 		Run: func(cmd *cobra.Command, args []string) {
-			printFunctions(args...)
+			printFunctions(cmd.OutOrStdout(), args...)
 		},
 	}
 }
 
-func printFunctions(names ...string) {
+func printFunctions(out io.Writer, names ...string) {
 	functions := jmespath.GetFunctions(config.NewDefaultConfiguration(false))
-	slices.SortFunc(functions, func(a, b jmespath.FunctionEntry) bool {
-		return a.String() < b.String()
+	slices.SortFunc(functions, func(a, b jmespath.FunctionEntry) int {
+		return cmp.Compare(a.String(), b.String())
 	})
 	namesSet := sets.New(names...)
 	for _, function := range functions {
 		if len(namesSet) == 0 || namesSet.Has(function.Name) {
 			note := function.Note
 			function.Note = ""
-			fmt.Println("Name:", function.Name)
-			fmt.Println("  Signature:", function.String())
+			fmt.Fprintln(out, "Name:", function.Name)
+			fmt.Fprintln(out, "  Signature:", function.String())
 			if note != "" {
-				fmt.Println("  Note:     ", note)
+				fmt.Fprintln(out, "  Note:     ", note)
 			}
-			fmt.Println()
+			fmt.Fprintln(out)
 		}
 	}
 }

pkg/clients/aggregator/discovery/resource.generated.go

@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	github_com_google_gnostic_openapiv2 "github.com/google/gnostic/openapiv2"
+	github_com_google_gnostic_models_openapiv2 "github.com/google/gnostic-models/openapiv2"
 	"github.com/kyverno/kyverno/pkg/metrics"
 	"go.uber.org/multierr"
 	k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -31,7 +31,7 @@ type withLogging struct {
 	logger logr.Logger
 }
 
-func (c *withLogging) OpenAPISchema() (*github_com_google_gnostic_openapiv2.Document, error) {
+func (c *withLogging) OpenAPISchema() (*github_com_google_gnostic_models_openapiv2.Document, error) {
 	start := time.Now()
 	logger := c.logger.WithValues("operation", "OpenAPISchema")
 	ret0, ret1 := c.inner.OpenAPISchema()
@@ -135,7 +135,7 @@ type withMetrics struct {
 	recorder metrics.Recorder
 }
 
-func (c *withMetrics) OpenAPISchema() (*github_com_google_gnostic_openapiv2.Document, error) {
+func (c *withMetrics) OpenAPISchema() (*github_com_google_gnostic_models_openapiv2.Document, error) {
 	defer c.recorder.Record("open_api_schema")
 	return c.inner.OpenAPISchema()
 }
@@ -182,7 +182,7 @@ type withTracing struct {
 	kind   string
 }
 
-func (c *withTracing) OpenAPISchema() (*github_com_google_gnostic_openapiv2.Document, error) {
+func (c *withTracing) OpenAPISchema() (*github_com_google_gnostic_models_openapiv2.Document, error) {
 	return c.inner.OpenAPISchema()
 }
 func (c *withTracing) OpenAPIV3() k8s_io_client_go_openapi.Client {

pkg/clients/apiserver/discovery/resource.generated.go

@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	github_com_google_gnostic_openapiv2 "github.com/google/gnostic/openapiv2"
+	github_com_google_gnostic_models_openapiv2 "github.com/google/gnostic-models/openapiv2"
 	"github.com/kyverno/kyverno/pkg/metrics"
 	"go.uber.org/multierr"
 	k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -31,7 +31,7 @@ type withLogging struct {
 	logger logr.Logger
 }
 
-func (c *withLogging) OpenAPISchema() (*github_com_google_gnostic_openapiv2.Document, error) {
+func (c *withLogging) OpenAPISchema() (*github_com_google_gnostic_models_openapiv2.Document, error) {
 	start := time.Now()
 	logger := c.logger.WithValues("operation", "OpenAPISchema")
 	ret0, ret1 := c.inner.OpenAPISchema()
@@ -135,7 +135,7 @@ type withMetrics struct {
 	recorder metrics.Recorder
 }
 
-func (c *withMetrics) OpenAPISchema() (*github_com_google_gnostic_openapiv2.Document, error) {
+func (c *withMetrics) OpenAPISchema() (*github_com_google_gnostic_models_openapiv2.Document, error) {
 	defer c.recorder.Record("open_api_schema")
 	return c.inner.OpenAPISchema()
 }
@@ -182,7 +182,7 @@ type withTracing struct {
 	kind   string
 }
 
-func (c *withTracing) OpenAPISchema() (*github_com_google_gnostic_openapiv2.Document, error) {
+func (c *withTracing) OpenAPISchema() (*github_com_google_gnostic_models_openapiv2.Document, error) {
 	return c.inner.OpenAPISchema()
 }
 func (c *withTracing) OpenAPIV3() k8s_io_client_go_openapi.Client {

pkg/clients/dclient/discovery.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	openapiv2 "github.com/google/gnostic/openapiv2"
+	openapiv2 "github.com/google/gnostic-models/openapiv2"
 	kubeutils "github.com/kyverno/kyverno/pkg/utils/kube"
 	"github.com/kyverno/kyverno/pkg/utils/wildcard"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/clients/dclient/fake.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	openapiv2 "github.com/google/gnostic/openapiv2"
+	openapiv2 "github.com/google/gnostic-models/openapiv2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

pkg/clients/kube/admissionregistrationv1beta1/client.generated.go

@@ -3,6 +3,8 @@ package client
 import (
 	"github.com/go-logr/logr"
 	mutatingwebhookconfigurations "github.com/kyverno/kyverno/pkg/clients/kube/admissionregistrationv1beta1/mutatingwebhookconfigurations"
+	validatingadmissionpolicies "github.com/kyverno/kyverno/pkg/clients/kube/admissionregistrationv1beta1/validatingadmissionpolicies"
+	validatingadmissionpolicybindings "github.com/kyverno/kyverno/pkg/clients/kube/admissionregistrationv1beta1/validatingadmissionpolicybindings"
 	validatingwebhookconfigurations "github.com/kyverno/kyverno/pkg/clients/kube/admissionregistrationv1beta1/validatingwebhookconfigurations"
 	"github.com/kyverno/kyverno/pkg/metrics"
 	k8s_io_client_go_kubernetes_typed_admissionregistration_v1beta1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1"
@@ -34,6 +36,14 @@ func (c *withMetrics) MutatingWebhookConfigurations() k8s_io_client_go_kubernete
 	recorder := metrics.ClusteredClientQueryRecorder(c.metrics, "MutatingWebhookConfiguration", c.clientType)
 	return mutatingwebhookconfigurations.WithMetrics(c.inner.MutatingWebhookConfigurations(), recorder)
 }
+func (c *withMetrics) ValidatingAdmissionPolicies() k8s_io_client_go_kubernetes_typed_admissionregistration_v1beta1.ValidatingAdmissionPolicyInterface {
+	recorder := metrics.ClusteredClientQueryRecorder(c.metrics, "ValidatingAdmissionPolicy", c.clientType)
+	return validatingadmissionpolicies.WithMetrics(c.inner.ValidatingAdmissionPolicies(), recorder)
+}
+func (c *withMetrics) ValidatingAdmissionPolicyBindings() k8s_io_client_go_kubernetes_typed_admissionregistration_v1beta1.ValidatingAdmissionPolicyBindingInterface {
+	recorder := metrics.ClusteredClientQueryRecorder(c.metrics, "ValidatingAdmissionPolicyBinding", c.clientType)
+	return validatingadmissionpolicybindings.WithMetrics(c.inner.ValidatingAdmissionPolicyBindings(), recorder)
+}
 func (c *withMetrics) ValidatingWebhookConfigurations() k8s_io_client_go_kubernetes_typed_admissionregistration_v1beta1.ValidatingWebhookConfigurationInterface {
 	recorder := metrics.ClusteredClientQueryRecorder(c.metrics, "ValidatingWebhookConfiguration", c.clientType)
 	return validatingwebhookconfigurations.WithMetrics(c.inner.ValidatingWebhookConfigurations(), recorder)
@@ -50,6 +60,12 @@ func (c *withTracing) RESTClient() rest.Interface {
 func (c *withTracing) MutatingWebhookConfigurations() k8s_io_client_go_kubernetes_typed_admissionregistration_v1beta1.MutatingWebhookConfigurationInterface {
 	return mutatingwebhookconfigurations.WithTracing(c.inner.MutatingWebhookConfigurations(), c.client, "MutatingWebhookConfiguration")
 }
+func (c *withTracing) ValidatingAdmissionPolicies() k8s_io_client_go_kubernetes_typed_admissionregistration_v1beta1.ValidatingAdmissionPolicyInterface {
+	return validatingadmissionpolicies.WithTracing(c.inner.ValidatingAdmissionPolicies(), c.client, "ValidatingAdmissionPolicy")
+}
+func (c *withTracing) ValidatingAdmissionPolicyBindings() k8s_io_client_go_kubernetes_typed_admissionregistration_v1beta1.ValidatingAdmissionPolicyBindingInterface {
+	return validatingadmissionpolicybindings.WithTracing(c.inner.ValidatingAdmissionPolicyBindings(), c.client, "ValidatingAdmissionPolicyBinding")
+}
 func (c *withTracing) ValidatingWebhookConfigurations() k8s_io_client_go_kubernetes_typed_admissionregistration_v1beta1.ValidatingWebhookConfigurationInterface {
 	return validatingwebhookconfigurations.WithTracing(c.inner.ValidatingWebhookConfigurations(), c.client, "ValidatingWebhookConfiguration")
 }
@@ -65,6 +81,12 @@ func (c *withLogging) RESTClient() rest.Interface {
 func (c *withLogging) MutatingWebhookConfigurations() k8s_io_client_go_kubernetes_typed_admissionregistration_v1beta1.MutatingWebhookConfigurationInterface {
 	return mutatingwebhookconfigurations.WithLogging(c.inner.MutatingWebhookConfigurations(), c.logger.WithValues("resource", "MutatingWebhookConfigurations"))
 }
+func (c *withLogging) ValidatingAdmissionPolicies() k8s_io_client_go_kubernetes_typed_admissionregistration_v1beta1.ValidatingAdmissionPolicyInterface {
+	return validatingadmissionpolicies.WithLogging(c.inner.ValidatingAdmissionPolicies(), c.logger.WithValues("resource", "ValidatingAdmissionPolicies"))
+}
+func (c *withLogging) ValidatingAdmissionPolicyBindings() k8s_io_client_go_kubernetes_typed_admissionregistration_v1beta1.ValidatingAdmissionPolicyBindingInterface {
+	return validatingadmissionpolicybindings.WithLogging(c.inner.ValidatingAdmissionPolicyBindings(), c.logger.WithValues("resource", "ValidatingAdmissionPolicyBindings"))
+}
 func (c *withLogging) ValidatingWebhookConfigurations() k8s_io_client_go_kubernetes_typed_admissionregistration_v1beta1.ValidatingWebhookConfigurationInterface {
 	return validatingwebhookconfigurations.WithLogging(c.inner.ValidatingWebhookConfigurations(), c.logger.WithValues("resource", "ValidatingWebhookConfigurations"))
 }