Updating deps (google#574)

* adding github template for bugs and features

* renaming

* adding comment

* nits

* nits

* updating to master

* missing files

* using revision instead of master

* dep ensure -update knative.dev/serving knative.dev/pkg knative.dev/eventing
hack/update-codegen.sh

* fix undefined var and unit test

* Updating vendor, moving pkg to 0.13

* adding config leader election

* adding config validation to leader election

* updating lock

* fixing webhook

Co-authored-by: Grace Gao <[email protected]>

Author: nachocano

Gopkg.lock

@@ -28,7 +28,7 @@ required = [
 # Our master branch tracks knative/pkg master or a release.
 [[override]]
   name = "knative.dev/pkg"
-  branch = "master"
+  branch = "release-0.13"
 
 # This is a preemptive override.
 [[override]]

Gopkg.toml

@@ -19,6 +19,7 @@ package main
 import (
 	"context"
 
+	configvalidation "github.com/google/knative-gcp/pkg/apis/configs/validation"
 	eventsv1alpha1 "github.com/google/knative-gcp/pkg/apis/events/v1alpha1"
 	messagingv1alpha1 "github.com/google/knative-gcp/pkg/apis/messaging/v1alpha1"
 	pubsubv1alpha1 "github.com/google/knative-gcp/pkg/apis/pubsub/v1alpha1"
@@ -27,6 +28,7 @@ import (
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/injection/sharedmain"
+	"knative.dev/pkg/leaderelection"
 	"knative.dev/pkg/logging"
 	"knative.dev/pkg/signals"
 	tracingconfig "knative.dev/pkg/tracing/config"
@@ -114,7 +116,8 @@ func NewConfigValidationController(ctx context.Context, cmw configmap.Watcher) *
 		configmap.Constructors{
 			tracingconfig.ConfigName: tracingconfig.NewTracingConfigFromConfigMap,
 			// metrics.ConfigMapName():   metricsconfig.NewObservabilityConfigFromConfigMap,
-			logging.ConfigMapName(): logging.NewConfigFromConfigMap,
+			logging.ConfigMapName():        logging.NewConfigFromConfigMap,
+			leaderelection.ConfigMapName(): configvalidation.ValidateLeaderElectionConfig,
 		},
 	)
 }
@@ -128,7 +131,7 @@ func main() {
 		SecretName: "webhook-certs",
 	})
 
-	sharedmain.MainWithContext(ctx, logconfig.WebhookName(),
+	sharedmain.WebhookMainWithContext(ctx, logconfig.WebhookName(),
 		certificates.NewController,
 		NewConfigValidationController,
 		NewValidationAdmissionController,

cmd/webhook/main.go

@@ -135,6 +135,12 @@ rules:
     - scaledobjects
   verbs: *everything
 
+- apiGroups:
+    - coordination.k8s.io
+  resources:
+    - leases
+  verbs: *everything
+
 ---
 # The role is needed for the aggregated role source-observer in knative-eventing to provide readonly access to "Sources".
 # See https://github.com/knative/eventing/blob/master/config/200-source-observer-clusterrole.yaml.

config/201-clusterrole.yaml

@@ -51,6 +51,8 @@ spec:
           value: config-logging
         - name: CONFIG_OBSERVABILITY_NAME
           value: config-observability
+        - name: CONFIG_LEADERELECTION_NAME
+          value: config-leader-election
         - name: METRICS_DOMAIN
           value: cloud.google.com/events
         volumeMounts:

config/500-controller.yaml

@@ -0,0 +1,62 @@
+# Copyright 2020 The Knative Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: config-leader-election
+  namespace: cloud-run-events
+  labels:
+    events.cloud.google.com/release: devel
+data:
+  # An inactive but valid configuration follows; see example.
+  resourceLock: "leases"
+  leaseDuration: "15s"
+  renewDeadline: "10s"
+  retryPeriod: "2s"
+  _example: |
+    ################################
+    #                              #
+    #    EXAMPLE CONFIGURATION     #
+    #                              #
+    ################################
+    # This block is not actually functional configuration,
+    # but serves to illustrate the available configuration
+    # options and document them in a way that is accessible
+    # to users that `kubectl edit` this config map.
+    #
+    # These sample configuration options may be copied out of
+    # this example block and unindented to be in the data block
+    # to actually change the configuration.
+    # resourceLock controls which API resource is used as the basis for the
+    # leader election lock. Valid values are:
+    #
+    # - leases -> use the coordination API
+    # - configmaps -> use configmaps
+    # - endpoints -> use endpoints
+    resourceLock: "leases"
+    # leaseDuration is how long non-leaders will wait to try to acquire the
+    # lock; 15 seconds is the value used by core kubernetes controllers.
+    leaseDuration: "15s"
+    # renewDeadline is how long a leader will try to renew the lease before
+    # giving up; 10 seconds is the value used by core kubernetes controllers.
+    renewDeadline: "10s"
+    # retryPeriod is how long the leader election client waits between tries of
+    # actions; 2 seconds is the value used by core kuberntes controllers.
+    retryPeriod: "2s"
+    # enabledComponents is a comma-delimited list of component names for which
+    # leader election is enabled. Valid values are:
+    #
+    # - controller
+    enabledComponents: "controller"

config/config-leader-election.yaml

@@ -0,0 +1,46 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package validation
+
+import (
+	"fmt"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
+	kle "knative.dev/pkg/leaderelection"
+)
+
+var (
+	validComponents = sets.NewString(
+		"controller",
+	)
+)
+
+func ValidateLeaderElectionConfig(configMap *corev1.ConfigMap) (*kle.Config, error) {
+	config, err := kle.NewConfigFromMap(configMap.Data)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, component := range config.EnabledComponents.List() {
+		if !validComponents.Has(component) {
+			return nil, fmt.Errorf("invalid enabledComponent %q: valid values are %q", component, validComponents.List())
+		}
+	}
+
+	return config, nil
+}

pkg/apis/configs/validation/leader_election.go

@@ -0,0 +1,90 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package validation
+
+import (
+	"errors"
+	"reflect"
+	"testing"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
+	kle "knative.dev/pkg/leaderelection"
+)
+
+func okConfig() *kle.Config {
+	return &kle.Config{
+		ResourceLock:      "leases",
+		LeaseDuration:     15 * time.Second,
+		RenewDeadline:     10 * time.Second,
+		RetryPeriod:       2 * time.Second,
+		EnabledComponents: sets.NewString("controller"),
+	}
+}
+
+func okData() map[string]string {
+	return map[string]string{
+		"resourceLock": "leases",
+		// values in this data come from the defaults suggested in the
+		// code:
+		// https://github.com/kubernetes/client-go/blob/kubernetes-1.16.0/tools/leaderelection/leaderelection.go
+		"leaseDuration":     "15s",
+		"renewDeadline":     "10s",
+		"retryPeriod":       "2s",
+		"enabledComponents": "controller",
+	}
+}
+
+func TestValidateLeaderElectionConfig(t *testing.T) {
+	cases := []struct {
+		name     string
+		data     map[string]string
+		expected *kle.Config
+		err      error
+	}{
+		{
+			name:     "OK",
+			data:     okData(),
+			expected: okConfig(),
+		},
+		{
+			name: "invalid component",
+			data: func() map[string]string {
+				data := okData()
+				data["enabledComponents"] = "controller,frobulator"
+				return data
+			}(),
+			err: errors.New(`invalid enabledComponent "frobulator": valid values are ["controller"]`),
+		},
+	}
+
+	for i := range cases {
+		tc := cases[i]
+		actualConfig, actualErr := ValidateLeaderElectionConfig(&corev1.ConfigMap{Data: tc.data})
+		if !reflect.DeepEqual(tc.err, actualErr) {
+			t.Errorf("%v: expected error\n%v\ngot:\n%v", tc.name, tc.err, actualErr)
+			continue
+		}
+
+		if !reflect.DeepEqual(tc.expected, actualConfig) {
+			t.Errorf("%v: expected config:\n%+v\ngot:\n%+v", tc.name, tc.expected, actualConfig)
+			continue
+		}
+	}
+
+}