Commit 6aa0645f authored by Chris Baumbauer's avatar Chris Baumbauer

Rename knative domainname field to hostname and fix changelog entry

parent 93cafdb4
......@@ -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"
......
......@@ -52,7 +52,7 @@ export default class ClusterStore {
statusReason: null,
requestStatus: null,
requestReason: null,
domainname: ''
hostname: ''
},
},
};
......
......@@ -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
......@@ -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(
......
......@@ -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
......@@ -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
......
---
title: Update Helm version to 2.11.0 and introduce Knative support
title: Introduce Knative support
author: Chris Baumbauer
merge_request: 43959
type: added
......@@ -35,7 +35,7 @@ class AddKnativeApplication < ActiveRecord::Migration
t.datetime_with_timezone "updated_at", null: false
t.integer "status", null: false
t.string "version", null: false
t.string "domainname", null: false
t.string "hostname", null: false
t.text "status_reason"
end
end
......
......@@ -674,7 +674,7 @@ ActiveRecord::Schema.define(version: 20181013005024) do
t.datetime_with_timezone "updated_at", null: false
t.integer "status", null: false
t.string "version", null: false
t.string "domainname", null: false
t.string "hostname", null: false
t.text "status_reason"
end
......
......@@ -1343,6 +1343,9 @@ msgstr ""
msgid "ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which may incur additional costs depending on the hosting provider your Kubernetes cluster is installed on. If you are using Google Kubernetes Engine, you can %{pricingLink}."
msgstr ""
msgid "ClusterIntegration|A Knative build extends Kubernetes and utilizes existing Kubernetes primitives to provide you with the ability to run on-cluster container builds from source. For example, you can write a build that uses Kubernetes-native resources to obtain your source code from a repository, build it into container a image, and then run that image."
msgstr ""
msgid "ClusterIntegration|API URL"
msgstr ""
......@@ -1715,9 +1718,6 @@ msgstr ""
msgid "ClusterIntegration|sign up"
msgstr ""
msgid "ClusterIntegration||A Knative build extends Kubernetes and utilizes existing Kubernetes primitives to provide you with the ability to run on-cluster container builds from source. For example, you can write a build that uses Kubernetes-native resources to obtain your source code from a repository, build it into container a image, and then run that image."
msgstr ""
msgid "Cohorts"
msgstr ""
......
......@@ -32,8 +32,7 @@
},
"status_reason": { "type": ["string", "null"] },
"external_ip": { "type": ["string", "null"] },
"hostname": { "type": ["string", "null"] },
"domainname": { "type": ["string", "null"] }
"hostname": { "type": ["string", "null"] }
},
"required" : [ "name", "status" ]
}
......
......@@ -92,7 +92,7 @@ describe('Applications', () => {
runner: { title: 'GitLab Runner' },
prometheus: { title: 'Prometheus' },
jupyter: { title: 'JupyterHub', hostname: '' },
knative: { title: 'Knative', domainname: '' },
knative: { title: 'Knative', hostname: '' },
},
});
......@@ -112,7 +112,7 @@ describe('Applications', () => {
runner: { title: 'GitLab Runner' },
prometheus: { title: 'Prometheus' },
jupyter: { title: 'JupyterHub', hostname: '' },
knative: { title: 'Knative', domainname: '' },
knative: { title: 'Knative', hostname: '' },
},
});
......@@ -131,7 +131,7 @@ describe('Applications', () => {
runner: { title: 'GitLab Runner' },
prometheus: { title: 'Prometheus' },
jupyter: { title: 'JupyterHub', hostname: '', status: 'installable' },
knative: { title: 'Knative', domainname: '', status: 'installable' },
knative: { title: 'Knative', hostname: '', status: 'installable' },
},
});
......@@ -148,7 +148,7 @@ describe('Applications', () => {
runner: { title: 'GitLab Runner' },
prometheus: { title: 'Prometheus' },
jupyter: { title: 'JupyterHub', hostname: '', status: 'installable' },
knative: { title: 'Knative', domainname: '', status: 'installable' },
knative: { title: 'Knative', hostname: '', status: 'installable' },
},
});
......@@ -165,7 +165,7 @@ describe('Applications', () => {
runner: { title: 'GitLab Runner' },
prometheus: { title: 'Prometheus' },
jupyter: { title: 'JupyterHub', status: 'installed', hostname: '' },
knative: { title: 'Knative', status: 'installed', domainname: '' },
knative: { title: 'Knative', status: 'installed', hostname: '' },
},
});
......
......@@ -106,7 +106,7 @@ describe('Clusters Store', () => {
statusReason: mockResponseData.applications[5].status_reason,
requestStatus: null,
requestReason: null,
domainname: '',
hostname: '',
},
},
});
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment