Rename knative domainname field to hostname and fix changelog entry

6 files changed, 5 insertions, 11 deletions

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index a477892fadd..e1d868dbac4 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -383,7 +383,7 @@ export default {
         :status-reason="applications.knative.statusReason"
         :request-status="applications.knative.requestStatus"
         :request-reason="applications.knative.requestReason"
-        :install-application-request-params="{ domainname: applications.knative.domainname}"
+        :install-application-request-params="{ hostname: applications.knative.domainname}"
         :disabled="!helmInstalled"
         class="hide-bottom-border rounded-bottom"
         title-link="https://github.com/knative/docs"
diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js
index c54a49eedd0..3727c147641 100644
--- a/app/assets/javascripts/clusters/stores/clusters_store.js
+++ b/app/assets/javascripts/clusters/stores/clusters_store.js
@@ -52,7 +52,7 @@ export default class ClusterStore {
           statusReason: null,
           requestStatus: null,
           requestReason: null,
-          domainname: ''
+          hostname: ''
         },
       },
     };
diff --git a/app/controllers/projects/clusters/applications_controller.rb b/app/controllers/projects/clusters/applications_controller.rb
index 2e45e47b55d..bcea96bce94 100644
--- a/app/controllers/projects/clusters/applications_controller.rb
+++ b/app/controllers/projects/clusters/applications_controller.rb
@@ -25,6 +25,5 @@ class Projects::Clusters::ApplicationsController < Projects::ApplicationControll
 
   def create_cluster_application_params
     params.permit(:application, :hostname)
-    params.permit(:application, :domainname)
   end
 end
diff --git a/app/models/clusters/applications/knative.rb b/app/models/clusters/applications/knative.rb
index 0c64bde73ae..76d23870f4c 100644
--- a/app/models/clusters/applications/knative.rb
+++ b/app/models/clusters/applications/knative.rb
@@ -18,7 +18,7 @@ module Clusters
       include ::Clusters::Concerns::ApplicationData
 
       default_value_for :version, VERSION
-      default_value_for :domainname, ''
+      default_value_for :hostname, ''
 
       def chart
         'knative/knative'
@@ -26,8 +26,8 @@ module Clusters
 
       def install_command
         args = []
-        if !domainname.nil? && !domainname.eql?('')
-          args = ["domain=" + domainname]
+        if !hostname.nil? && !hostname.eql?('')
+          args = ["domain=" + hostname]
         end
 
         Gitlab::Kubernetes::Helm::InstallCommand.new(
diff --git a/app/serializers/cluster_application_entity.rb b/app/serializers/cluster_application_entity.rb
index d2f3e6ad130..2bd17e58086 100644
--- a/app/serializers/cluster_application_entity.rb
+++ b/app/serializers/cluster_application_entity.rb
@@ -6,5 +6,4 @@ class ClusterApplicationEntity < Grape::Entity
   expose :status_reason
   expose :external_ip, if: -> (e, _) { e.respond_to?(:external_ip) }
   expose :hostname, if: -> (e, _) { e.respond_to?(:hostname) }
-  expose :domainname, if: -> (e, _) { e.respond_to?(:domainname) }
 end
diff --git a/app/services/clusters/applications/create_service.rb b/app/services/clusters/applications/create_service.rb
index 50107578bd5..c348cad4803 100644
--- a/app/services/clusters/applications/create_service.rb
+++ b/app/services/clusters/applications/create_service.rb
@@ -19,10 +19,6 @@ module Clusters
             application.hostname = params[:hostname]
           end
 
-          if application.has_attribute?(:domainname)
-            application.domainname = params[:domainname]
-          end
-
           if application.respond_to?(:oauth_application)
             application.oauth_application = create_oauth_application(application, request)
           end