Merge branch 'rachelfox-master-patch-64183' into 'master'

fix canary typo See merge request gitlab-org/gitlab!46410

Merge branch 'rachelfox-master-patch-64183' into 'master'
fix canary typo See merge request gitlab-org/gitlab!46410
c17471b3 · Stan Hu · d6d6cd7c · a4d6e96f · c17471b3
Commit c17471b3 authored Oct 29, 2020 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ee/lib/gitlab/kubernetes/ingress.rb ee/lib/gitlab/kubernetes/ingress.rb +1 -1

No files found.
--- a/ee/lib/gitlab/kubernetes/ingress.rb
+++ b/ee/lib/gitlab/kubernetes/ingress.rb
@@ -5,7 +5,7 @@ module Gitlab
    class Ingress
      include Gitlab::Utils::StrongMemoize

-      # Canry Ingress Annotations https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#canary
+      # Canary Ingress Annotations https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#canary
      ANNOTATION_KEY_CANARY = 'nginx.ingress.kubernetes.io/canary'
      ANNOTATION_KEY_CANARY_WEIGHT = 'nginx.ingress.kubernetes.io/canary-weight'