Merge branch '30035-update-knative-to-0-7' into 'master'

Update Knative to 0.7

See merge request gitlab-org/gitlab!17367

app/models/clusters/applications/knative.rb

@@ -3,7 +3,7 @@
 module Clusters
   module Applications
     class Knative < ApplicationRecord
-      VERSION = '0.6.0'
+      VERSION = '0.7.0'
       REPOSITORY = 'https://storage.googleapis.com/triggermesh-charts'
       METRICS_CONFIG = 'https://storage.googleapis.com/triggermesh-charts/istio-metrics.yaml'
       FETCH_IP_ADDRESS_DELAY = 30.seconds

app/serializers/projects/serverless/service_entity.rb

@@ -44,7 +44,7 @@ module Projects
       end
 
       expose :url do |service|
-        "http://#{service.dig('status', 'domain')}"
+        service.dig('status', 'url')
       end
 
       expose :description do |service|

changelogs/unreleased/knative-0-7.yml

+---
+title: Knative version bump 0.6 -> 0.7
+merge_request: 17367
+author: Chris Baumbauer
+type: changed

config/knative/api_resources.yml

@@ -61,4 +61,10 @@
 - virtualservices.networking.istio.io
 - rbacconfigs.rbac.istio.io
 - servicerolebindings.rbac.istio.io
-- serviceroles.rbac.istio.io
\ No newline at end of file
+- serviceroles.rbac.istio.io
+- cloudwatches.config.istio.io
+- clusterrbacconfigs.rbac.istio.io
+- dogstatsds.config.istio.io
+- ingresses.networking.internal.knative.dev
+- sidecars.networking.istio.io
+- zipkins.config.istio.io

config/prometheus/common_metrics.yml

@@ -209,6 +209,6 @@ panel_groups:
     weight: 1
     metrics:
     - id: system_metrics_knative_function_invocation_count
-      query_range: 'floor(sum(rate(istio_revision_request_count{destination_configuration="%{function_name}", destination_namespace="%{kube_namespace}"}[1m])/3))'
+      query_range: 'sum(ceil(rate(istio_requests_total{destination_service_namespace="%{kube_namespace}", destination_app=~"%{function_name}.*"}[1m])*60))'
       label: invocations / minute
       unit: requests

db/post_migrate/20190819231552_update_knative_prometheus_query_for_invocation_count.rb

+# frozen_string_literal: true
+
+class UpdateKnativePrometheusQueryForInvocationCount < ActiveRecord::Migration[5.2]
+  DOWNTIME = false
+
+  def up
+    ::Gitlab::DatabaseImporters::CommonMetrics::Importer.new.execute
+  end
+
+  def down
+    # no-op
+  end
+end

spec/models/clusters/applications/knative_spec.rb

@@ -119,7 +119,7 @@ describe Clusters::Applications::Knative do
     subject { knative.install_command }
 
     it 'is initialized with latest version' do
-      expect(subject.version).to eq('0.6.0')
+      expect(subject.version).to eq('0.7.0')
     end
 
     it_behaves_like 'a command'

spec/support/helpers/kubernetes_helpers.rb

@@ -410,8 +410,10 @@ module KubernetesHelpers
         "generation" => 2
       },
       "status" => {
-        "domain" => "#{name}.#{namespace}.#{domain}",
-        "domainInternal" => "#{name}.#{namespace}.svc.cluster.local",
+        "url" => "http://#{name}.#{namespace}.#{domain}",
+        "address" => {
+          "url" => "#{name}.#{namespace}.svc.cluster.local"
+        },
         "latestCreatedRevisionName" => "#{name}-00002",
         "latestReadyRevisionName" => "#{name}-00002",
         "observedGeneration" => 2
@@ -437,8 +439,10 @@ module KubernetesHelpers
         }
       },
       "status" => {
-        "domain" => "#{name}.#{namespace}.#{domain}",
-        "domainInternal" => "#{name}.#{namespace}.svc.cluster.local",
+        "url" => "http://#{name}.#{namespace}.#{domain}",
+        "address" => {
+          "url" => "#{name}.#{namespace}.svc.cluster.local"
+        },
         "latestCreatedRevisionName" => "#{name}-00002",
         "latestReadyRevisionName" => "#{name}-00002",
         "observedGeneration" => 2