kn v0.16.0 release prep (#922)

* Update unit test for invalid concurrency target value

* Vendor v0.16.0 eventing and serving

* Commit the LICENSES generated by hack/update-deps.sh

* Spare third_party dir from license check in hack/build.sh

* Update eventing and serving version for 'kn version'

* Use DeprecatedInjectionAnnotation key for backward compatibility

  Fixes #918
  Use DeprecatedInjectionAnnotation, i.e. "knative-eventing-injection"
  for reconciling broker via namespace labeling and trigger annotations.

  From eventing v0.16.0 release, this key is changed to "eventing.knative.dev/injection"
  however, older eventing installation wont recognize it. So we continue
  using the deprecated key until the sugar-controller would support reconciling
  on either keys.

* Fix(kn version): Display eventing.knative.dev at v1beta1 version

 We've been showing 'v1alpha1' in kn version while we actually
 vendor and refer v1beta1 for eventing.knative.dev

* chore(e2e): Run tests against serving/eventing v0.16.0 release

* Update test for concurrency-target to expect new error message

 the new error message for incorrect concurrency-target value contains "should be at least 0.01"

* Setup sugar-controller for released eventing version setup

 - reuse knative_setup util from common lib for latest-release CI setup

* Fix typo in YAML URL and add subheader for sugar-controller install

Author: navidshaikh

go.mod

@@ -10,14 +10,14 @@ require (
 	github.com/spf13/viper v1.6.2
 	golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.17.6
-	k8s.io/apimachinery v0.17.6
+	k8s.io/api v0.18.1
+	k8s.io/apimachinery v0.18.1
 	k8s.io/cli-runtime v0.17.6
 	k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
 	k8s.io/code-generator v0.18.0
-	knative.dev/eventing v0.15.1-0.20200608083719-c024353a712c
-	knative.dev/pkg v0.0.0-20200606224418-7ed1d4a552bc
-	knative.dev/serving v0.15.1-0.20200608114919-92e849c1db9c
+	knative.dev/eventing v0.16.0
+	knative.dev/pkg v0.0.0-20200702222342-ea4d6e985ba0
+	knative.dev/serving v0.16.0
 	sigs.k8s.io/yaml v1.2.0
 )
 

go.sum

@@ -170,7 +170,7 @@ check_license() {
 
   local check_output=$(mktemp /tmp/kn-client-licence-check.XXXXXX)
   for ext in "${extensions_to_check[@]}"; do
-    find . -name "*.$ext" -a \! -path "./vendor/*" -a \! -path "./.*" -print0 |
+    find . -name "*.$ext" -a \! -path "./vendor/*" -a \! -path "./.*" -a \! -path "./third_party/*" -print0 |
       while IFS= read -r -d '' path; do
         for rword in "${required_keywords[@]}"; do
           if ! grep -q "$rword" "$path"; then

hack/build.sh

@@ -24,7 +24,7 @@ import (
 
 // LabelNamespaceForDefaultBroker adds label 'knative-eventing-injection=enabled' to the configured namespace
 func LabelNamespaceForDefaultBroker(r *KnRunResultCollector) error {
-	cmd := []string{"label", "namespace", r.KnTest().Kn().Namespace(), v1beta1.InjectionAnnotation + "=enabled"}
+	cmd := []string{"label", "namespace", r.KnTest().Kn().Namespace(), v1beta1.DeprecatedInjectionAnnotation + "=enabled"}
 	_, err := Kubectl{}.Run(cmd...)
 
 	if err != nil {
@@ -43,7 +43,7 @@ func LabelNamespaceForDefaultBroker(r *KnRunResultCollector) error {
 
 // UnlabelNamespaceForDefaultBroker removes label 'knative-eventing-injection=enabled' from the configured namespace
 func UnlabelNamespaceForDefaultBroker(r *KnRunResultCollector) {
-	cmd := []string{"label", "namespace", r.KnTest().Kn().Namespace(), v1beta1.InjectionAnnotation + "-"}
+	cmd := []string{"label", "namespace", r.KnTest().Kn().Namespace(), v1beta1.DeprecatedInjectionAnnotation + "-"}
 	_, err := Kubectl{}.Run(cmd...)
 	if err != nil {
 		r.T().Fatalf("error executing '%s': %s", strings.Join(cmd, " "), err.Error())

lib/test/broker.go

@@ -182,10 +182,10 @@ func (b *TriggerBuilder) Broker(broker string) *TriggerBuilder {
 // InjectBroker to add annotation to setup default broker
 func (b *TriggerBuilder) InjectBroker(inject bool) *TriggerBuilder {
 	if inject {
-		meta_v1.SetMetaDataAnnotation(&b.trigger.ObjectMeta, v1beta1.InjectionAnnotation, "enabled")
+		meta_v1.SetMetaDataAnnotation(&b.trigger.ObjectMeta, v1beta1.DeprecatedInjectionAnnotation, "enabled")
 	} else {
-		if meta_v1.HasAnnotation(b.trigger.ObjectMeta, v1beta1.InjectionAnnotation) {
-			delete(b.trigger.ObjectMeta.Annotations, v1beta1.InjectionAnnotation)
+		if meta_v1.HasAnnotation(b.trigger.ObjectMeta, v1beta1.DeprecatedInjectionAnnotation) {
+			delete(b.trigger.ObjectMeta.Annotations, v1beta1.DeprecatedInjectionAnnotation)
 		}
 	}
 	return b

pkg/eventing/v1beta1/client.go

@@ -178,7 +178,7 @@ func TestTriggerBuilder(t *testing.T) {
 		b.InjectBroker(true)
 		expected := &metav1.ObjectMeta{
 			Annotations: map[string]string{
-				v1beta1.InjectionAnnotation: "enabled",
+				v1beta1.DeprecatedInjectionAnnotation: "enabled",
 			},
 		}
 		assert.DeepEqual(t, expected.Annotations, b.Build().ObjectMeta.Annotations)

pkg/eventing/v1beta1/client_test.go

@@ -31,11 +31,11 @@ var GitRevision string
 // update this var as we add more deps
 var apiVersions = map[string][]string{
 	"serving": {
-		"serving.knative.dev/v1 (knative-serving v0.15.0)",
+		"serving.knative.dev/v1 (knative-serving v0.16.0)",
 	},
 	"eventing": {
-		"sources.knative.dev/v1alpha2 (knative-eventing v0.15.0)",
-		"eventing.knative.dev/v1alpha1 (knative-eventing v0.15.0)",
+		"sources.knative.dev/v1alpha2 (knative-eventing v0.16.0)",
+		"eventing.knative.dev/v1beta1 (knative-eventing v0.16.0)",
 	},
 }
 

pkg/kn/commands/version/version.go

@@ -228,7 +228,7 @@ func TestUpdateConcurrencyTarget(t *testing.T) {
 	checkAnnotationValueInt(t, template, autoscaling.TargetAnnotationKey, 10)
 	// Update with invalid value
 	err = UpdateConcurrencyTarget(template, -1)
-	assert.ErrorContains(t, err, "invalid")
+	assert.ErrorContains(t, err, "should be at least 0.01")
 }
 
 func TestUpdateConcurrencyLimit(t *testing.T) {

pkg/serving/config_changes_test.go

@@ -37,11 +37,17 @@ function knative_setup() {
   if [ "${eventing_version}" = "latest" ]; then
     start_latest_knative_eventing
 
+    subheader "Installing eventing extension: sugar-controller (${eventing_version})"
     # install the sugar controller
     kubectl apply --filename https://storage.googleapis.com/knative-nightly/eventing/latest/eventing-sugar-controller.yaml
     wait_until_pods_running knative-eventing || return 1
 
   else
     start_release_knative_eventing "${eventing_version}"
+
+    subheader "Installing eventing extension: sugar-controller (${eventing_version})"
+    # install the sugar controller
+    kubectl apply --filename https://storage.googleapis.com/knative-releases/eventing/previous/v${eventing_version}/eventing-sugar-controller.yaml
+    wait_until_pods_running knative-eventing || return 1
   fi
 }

test/common.sh

@@ -57,7 +57,7 @@ func TestServiceOptions(t *testing.T) {
 	t.Log("update concurrency options with invalid values for service")
 	out := r.KnTest().Kn().Run("service", "update", "svc1", "--concurrency-limit", "-1", "--concurrency-target", "0")
 	r.AssertError(out)
-	assert.Check(r.T(), util.ContainsAll(out.Stderr, "invalid"))
+	assert.Check(r.T(), util.ContainsAll(out.Stderr, "should be at least 0.01"))
 
 	t.Log("returns steady concurrency options for service")
 	validateServiceConcurrencyLimit(r, "svc1", "300")