Skip to content
Snippets Groups Projects
Commit e4e26f9f authored by Heinrich Lee Yu's avatar Heinrich Lee Yu
Browse files

Merge branch 'anna/update-certificate-based-clusters-deprecation-date' into 'master' 

Update removal date in clusters deprecation alert

See merge request !97383
parents bc22efb1 144d07e6
No related branches found
No related tags found
1 merge request!97383Update removal date in clusters deprecation alert
Pipeline #635278178 passed with warnings
Stage: sync
Stage: prepare
Stage: build-images
Stage: fixtures
Stage: lint
Stage: test
Stage: post-test
Stage: review
Stage: qa
Stage: pages
Stage: deploy
Pipeline: GitLab

#635284494

    Pipeline: GitLab

    #635284384

      Hide whitespace changes
      Inline Side-by-side
      app/helpers/projects_helper.rb
      + 2
      − 2
      View file @ e4e26f9f
      ......@@ -454,9 +454,9 @@ def show_clusters_alert?(project)
      def clusters_deprecation_alert_message
      if has_active_license?
      s_('ClusterIntegration|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of November 2022. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd} or reach out to GitLab support.')
      s_('ClusterIntegration|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of February 2023. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd} or reach out to GitLab support.')
      else
      s_('ClusterIntegration|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of November 2022. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd}.')
      s_('ClusterIntegration|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of February 2023. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd}.')
      end
      end
      ......
      locale/gitlab.pot
      + 2
      − 2
      View file @ e4e26f9f
      ......@@ -9224,10 +9224,10 @@ msgstr ""
      msgid "ClusterIntegration|The URL used to access the Kubernetes API."
      msgstr ""
       
      msgid "ClusterIntegration|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of November 2022. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd} or reach out to GitLab support."
      msgid "ClusterIntegration|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of February 2023. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd} or reach out to GitLab support."
      msgstr ""
       
      msgid "ClusterIntegration|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of November 2022. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd}."
      msgid "ClusterIntegration|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of February 2023. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd}."
      msgstr ""
       
      msgid "ClusterIntegration|The certificate-based method to connect clusters to GitLab was %{linkStart}deprecated%{linkEnd} in GitLab 14.5."
      spec/helpers/projects_helper_spec.rb
      + 2
      − 2
      View file @ e4e26f9f
      ......@@ -1290,7 +1290,7 @@ def license_name
      let_it_be(:has_active_license) { true }
      it 'displays the correct messagee' do
      expect(subject).to eq(s_('Clusters|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of November 2022. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd} or reach out to GitLab support.'))
      expect(subject).to eq(s_('Clusters|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of February 2023. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd} or reach out to GitLab support.'))
      end
      end
      ......@@ -1298,7 +1298,7 @@ def license_name
      let_it_be(:has_active_license) { false }
      it 'displays the correct message' do
      expect(subject).to eq(s_('Clusters|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of November 2022. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd}.'))
      expect(subject).to eq(s_('Clusters|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of February 2023. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd}.'))
      end
      end
      end
      ......
      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