Add latest changes from gitlab-org/gitlab@master

spec/models/clusters/cluster_spec.rb

@@ -508,9 +508,10 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
       let!(:runner) { create(:clusters_applications_runner, cluster: cluster) }
       let!(:jupyter) { create(:clusters_applications_jupyter, cluster: cluster) }
       let!(:knative) { create(:clusters_applications_knative, cluster: cluster) }
+      let!(:elastic_stack) { create(:clusters_applications_elastic_stack, cluster: cluster) }
       it 'returns a list of created applications' do
-        is_expected.to contain_exactly(helm, ingress, cert_manager, prometheus, runner, jupyter, knative)
+        is_expected.to contain_exactly(helm, ingress, cert_manager, prometheus, runner, jupyter, knative, elastic_stack)
       end
     end
   end

spec/models/issue_spec.rb

@@ -423,6 +423,19 @@ describe Issue do
       issue = create(:issue, title: 'testing-issue', confidential: true)
       expect(issue.to_branch_name).to match /confidential-issue\z/
     end
+
+    context 'issue title longer than 100 characters' do
+      let(:issue) { create(:issue, iid: 999, title: 'Lorem ipsum dolor sit amet consectetur adipiscing elit Mauris sit amet ipsum id lacus custom fringilla convallis') }
+
+      it "truncates branch name to at most 100 characters" do
+        expect(issue.to_branch_name.length).to be <= 100
+      end
+
+      it "truncates dangling parts of the branch name" do
+        # 100 characters would've got us "999-lorem...lacus-custom-fri".
+        expect(issue.to_branch_name).to eq("999-lorem-ipsum-dolor-sit-amet-consectetur-adipiscing-elit-mauris-sit-amet-ipsum-id-lacus-custom")
+      end
+    end
   end
   describe '#can_be_worked_on?' do

spec/services/clusters/applications/create_service_spec.rb

@@ -132,6 +132,34 @@ describe Clusters::Applications::CreateService do
           expect(subject.hostname).to eq('example.com')
         end
       end
+
+      context 'elastic stack application' do
+        let(:params) do
+          {
+            application: 'elastic_stack',
+            kibana_hostname: 'example.com'
+          }
+        end
+
+        before do
+          create(:clusters_applications_ingress, :installed, external_ip: "127.0.0.0", cluster: cluster)
+          expect_any_instance_of(Clusters::Applications::ElasticStack)
+            .to receive(:make_scheduled!)
+            .and_call_original
+        end
+
+        it 'creates the application' do
+          expect do
+            subject
+
+            cluster.reload
+          end.to change(cluster, :application_elastic_stack)
+        end
+
+        it 'sets the kibana_hostname' do
+          expect(subject.kibana_hostname).to eq('example.com')
+        end
+      end
     end
     context 'invalid application' do

spec/support/shared_examples/models/cluster_application_helm_cert_examples.rb

@@ -8,10 +8,6 @@ shared_examples 'cluster application helm specs' do |application_name|
     it { is_expected.to be_an_instance_of(Gitlab::Kubernetes::Helm::DeleteCommand) }
-    it 'has the application name' do
-      expect(subject.name).to eq(application.name)
-    end
-
     it 'has files' do
       expect(subject.files).to eq(application.files)
     end

vendor/elastic_stack/values.yaml

+elasticsearch:
+  enabled: true
+  cluster:
+    env:
+      MINIMUM_MASTER_NODES: "1"
+  master:
+    replicas: 2
+  client:
+    replicas: 1
+  data:
+    replicas: 1
+
+kibana:
+  enabled: true
+  env:
+    ELASTICSEARCH_HOSTS: http://elastic-stack-elasticsearch-client:9200
+  ingress:
+    enabled: true
+    annotations:
+      kubernetes.io/ingress.class: "nginx"
+      kubernetes.io/tls-acme: "true"
+
+logstash:
+  enabled: false
+
+filebeat:
+  enabled: true
+  config:
+    output.file.enabled: false
+    output.elasticsearch:
+      enabled: true
+      hosts: ["http://elastic-stack-elasticsearch-client:9200"]
+
+fluentd:
+  enabled: false
+
+fluent-bit:
+  enabled: false
+
+nginx-ldapauth-proxy:
+  enabled: false
+
+elasticsearch-curator:
+  enabled: false
+
+elasticsearch-exporter:
+  enabled: false