Fix the way hostname is validated with the knative app
This commit is contained in:
parent
c10452d285
commit
73789fdfd2
6 changed files with 17 additions and 124 deletions
|
@ -52,7 +52,7 @@ export default class ClusterStore {
|
||||||
statusReason: null,
|
statusReason: null,
|
||||||
requestStatus: null,
|
requestStatus: null,
|
||||||
requestReason: null,
|
requestReason: null,
|
||||||
hostname: null
|
hostname: null,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -102,7 +102,9 @@ export default class ClusterStore {
|
||||||
? `jupyter.${this.state.applications.ingress.externalIp}.nip.io`
|
? `jupyter.${this.state.applications.ingress.externalIp}.nip.io`
|
||||||
: '');
|
: '');
|
||||||
} else if (appId === KNATIVE) {
|
} else if (appId === KNATIVE) {
|
||||||
this.state.applications.knative.hostname = serverAppEntry.hostname ? serverAppEntry.hostname : null;
|
this.state.applications.knative.hostname = serverAppEntry.hostname
|
||||||
|
? serverAppEntry.hostname
|
||||||
|
: null;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,8 +20,6 @@ module Clusters
|
||||||
default_value_for :version, VERSION
|
default_value_for :version, VERSION
|
||||||
default_value_for :hostname, nil
|
default_value_for :hostname, nil
|
||||||
|
|
||||||
validates :hostname, presence: true
|
|
||||||
|
|
||||||
def chart
|
def chart
|
||||||
'knative/knative'
|
'knative/knative'
|
||||||
end
|
end
|
||||||
|
@ -31,6 +29,10 @@ module Clusters
|
||||||
end
|
end
|
||||||
|
|
||||||
def install_command
|
def install_command
|
||||||
|
if hostname.nil?
|
||||||
|
raise 'Hostname is required'
|
||||||
|
end
|
||||||
|
|
||||||
Gitlab::Kubernetes::Helm::InstallCommand.new(
|
Gitlab::Kubernetes::Helm::InstallCommand.new(
|
||||||
name: name,
|
name: name,
|
||||||
version: VERSION,
|
version: VERSION,
|
||||||
|
|
|
@ -13,7 +13,7 @@ class AddKnativeApplication < ActiveRecord::Migration
|
||||||
t.datetime_with_timezone "updated_at", null: false
|
t.datetime_with_timezone "updated_at", null: false
|
||||||
t.integer "status", null: false
|
t.integer "status", null: false
|
||||||
t.string "version", null: false
|
t.string "version", null: false
|
||||||
t.string "hostname", null: false
|
t.string "hostname"
|
||||||
t.text "status_reason"
|
t.text "status_reason"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -709,7 +709,7 @@ ActiveRecord::Schema.define(version: 20181101144347) do
|
||||||
t.datetime_with_timezone "updated_at", null: false
|
t.datetime_with_timezone "updated_at", null: false
|
||||||
t.integer "status", null: false
|
t.integer "status", null: false
|
||||||
t.string "version", null: false
|
t.string "version", null: false
|
||||||
t.string "hostname", null: false
|
t.string "hostname"
|
||||||
t.text "status_reason"
|
t.text "status_reason"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -4,126 +4,15 @@ describe Clusters::Applications::Knative do
|
||||||
let(:knative) { create(:clusters_applications_knative, hostname: 'example.com') }
|
let(:knative) { create(:clusters_applications_knative, hostname: 'example.com') }
|
||||||
|
|
||||||
include_examples 'cluster application core specs', :clusters_applications_knative
|
include_examples 'cluster application core specs', :clusters_applications_knative
|
||||||
|
include_examples 'cluster application status specs', :clusters_applications_knative
|
||||||
describe '#status' do
|
|
||||||
let(:cluster) { create(:cluster, :provided_by_gcp) }
|
|
||||||
|
|
||||||
subject { described_class.new(cluster: cluster) }
|
|
||||||
|
|
||||||
it 'sets a default status' do
|
|
||||||
expect(subject.status_name).to be(:not_installable)
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when application helm is scheduled' do
|
|
||||||
before do
|
|
||||||
create(:clusters_applications_helm, :scheduled, cluster: cluster)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'defaults to :not_installable' do
|
|
||||||
expect(subject.status_name).to be(:not_installable)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when application is scheduled' do
|
|
||||||
before do
|
|
||||||
create(:clusters_applications_helm, :installed, cluster: cluster)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'sets a default status' do
|
|
||||||
expect(subject.status_name).to be(:installable)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'status state machine' do
|
|
||||||
describe '#make_installing' do
|
|
||||||
subject { create(:clusters_applications_knative, :scheduled, hostname: 'example.com') }
|
|
||||||
|
|
||||||
it 'is installing' do
|
|
||||||
subject.make_installing!
|
|
||||||
|
|
||||||
expect(subject).to be_installing
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '#make_installed' do
|
|
||||||
subject { create(:clusters_applications_knative, :installing, hostname: 'example.com') }
|
|
||||||
|
|
||||||
it 'is installed' do
|
|
||||||
subject.make_installed
|
|
||||||
|
|
||||||
expect(subject).to be_installed
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '#make_errored' do
|
|
||||||
subject { create(:clusters_applications_knative, :installing, hostname: 'example.com') }
|
|
||||||
let(:reason) { 'some errors' }
|
|
||||||
|
|
||||||
it 'is errored' do
|
|
||||||
subject.make_errored(reason)
|
|
||||||
|
|
||||||
expect(subject).to be_errored
|
|
||||||
expect(subject.status_reason).to eq(reason)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
describe '#make_scheduled' do
|
|
||||||
subject { create(:clusters_applications_knative, :installable, hostname: 'example.com') }
|
|
||||||
|
|
||||||
it 'is scheduled' do
|
|
||||||
subject.make_scheduled
|
|
||||||
|
|
||||||
expect(subject).to be_scheduled
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'when was errored' do
|
|
||||||
subject { create(:clusters_applications_knative, :errored, hostname: 'example.com') }
|
|
||||||
|
|
||||||
it 'clears #status_reason' do
|
|
||||||
expect(subject.status_reason).not_to be_nil
|
|
||||||
|
|
||||||
subject.make_scheduled!
|
|
||||||
|
|
||||||
expect(subject.status_reason).to be_nil
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '#available?' do
|
|
||||||
using RSpec::Parameterized::TableSyntax
|
|
||||||
|
|
||||||
where(:trait, :available) do
|
|
||||||
:not_installable | false
|
|
||||||
:installable | false
|
|
||||||
:scheduled | false
|
|
||||||
:installing | false
|
|
||||||
:installed | true
|
|
||||||
:updating | false
|
|
||||||
:updated | true
|
|
||||||
:errored | false
|
|
||||||
:update_errored | false
|
|
||||||
:timeouted | false
|
|
||||||
end
|
|
||||||
|
|
||||||
with_them do
|
|
||||||
subject { build(:clusters_applications_knative, trait) }
|
|
||||||
|
|
||||||
if params[:available]
|
|
||||||
it { is_expected.to be_available }
|
|
||||||
else
|
|
||||||
it { is_expected.not_to be_available }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '.installed' do
|
describe '.installed' do
|
||||||
subject { described_class.installed }
|
subject { described_class.installed }
|
||||||
|
|
||||||
let!(:cluster) { create(:clusters_applications_knative, :installed, hostname: 'example.com') }
|
let!(:cluster) { create(:clusters_applications_knative, :installed) }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
create(:clusters_applications_knative, :errored, hostname: 'example.com')
|
create(:clusters_applications_knative, :errored)
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_exactly(cluster) }
|
it { is_expected.to contain_exactly(cluster) }
|
||||||
|
@ -135,7 +24,7 @@ describe Clusters::Applications::Knative do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'application install previously errored with older version' do
|
context 'application install previously errored with older version' do
|
||||||
let(:application) { create(:clusters_applications_knative, :scheduled, version: '0.1.3', hostname: 'example.com') }
|
let(:application) { create(:clusters_applications_knative, :scheduled, version: '0.1.3') }
|
||||||
|
|
||||||
it 'updates the application version' do
|
it 'updates the application version' do
|
||||||
expect(application.reload.version).to eq('0.1.3')
|
expect(application.reload.version).to eq('0.1.3')
|
||||||
|
@ -146,10 +35,10 @@ describe Clusters::Applications::Knative do
|
||||||
describe '#make_installed' do
|
describe '#make_installed' do
|
||||||
subject { described_class.installed }
|
subject { described_class.installed }
|
||||||
|
|
||||||
let!(:cluster) { create(:clusters_applications_knative, :installed, hostname: 'example.com') }
|
let!(:cluster) { create(:clusters_applications_knative, :installed) }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
create(:clusters_applications_knative, :errored, hostname: 'example.com')
|
create(:clusters_applications_knative, :errored)
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_exactly(cluster) }
|
it { is_expected.to contain_exactly(cluster) }
|
||||||
|
|
|
@ -314,7 +314,7 @@ describe Clusters::Cluster do
|
||||||
let!(:prometheus) { create(:clusters_applications_prometheus, cluster: cluster) }
|
let!(:prometheus) { create(:clusters_applications_prometheus, cluster: cluster) }
|
||||||
let!(:runner) { create(:clusters_applications_runner, cluster: cluster) }
|
let!(:runner) { create(:clusters_applications_runner, cluster: cluster) }
|
||||||
let!(:jupyter) { create(:clusters_applications_jupyter, cluster: cluster) }
|
let!(:jupyter) { create(:clusters_applications_jupyter, cluster: cluster) }
|
||||||
let!(:knative) { create(:clusters_applications_knative, cluster: cluster, hostname: 'example.com') }
|
let!(:knative) { create(:clusters_applications_knative, cluster: cluster) }
|
||||||
|
|
||||||
it 'returns a list of created applications' do
|
it 'returns a list of created applications' do
|
||||||
is_expected.to contain_exactly(helm, ingress, prometheus, runner, jupyter, knative)
|
is_expected.to contain_exactly(helm, ingress, prometheus, runner, jupyter, knative)
|
||||||
|
|
Loading…
Reference in a new issue