diff options
Diffstat (limited to 'app/models/clusters/kubernetes_namespace.rb')
-rw-r--r-- | app/models/clusters/kubernetes_namespace.rb | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/app/models/clusters/kubernetes_namespace.rb b/app/models/clusters/kubernetes_namespace.rb index 73da6cb37d7..f5629a7b53d 100644 --- a/app/models/clusters/kubernetes_namespace.rb +++ b/app/models/clusters/kubernetes_namespace.rb @@ -4,17 +4,17 @@ module Clusters class KubernetesNamespace < ActiveRecord::Base include Gitlab::Kubernetes - self.table_name = 'clusters_kubernetes_namespaces' + self.table_name = "clusters_kubernetes_namespaces" - belongs_to :cluster_project, class_name: 'Clusters::Project' - belongs_to :cluster, class_name: 'Clusters::Cluster' - belongs_to :project, class_name: '::Project' + belongs_to :cluster_project, class_name: "Clusters::Project" + belongs_to :cluster, class_name: "Clusters::Cluster" + belongs_to :project, class_name: "::Project" has_one :platform_kubernetes, through: :cluster before_validation :set_defaults validates :namespace, presence: true - validates :namespace, uniqueness: { scope: :cluster_id } + validates :namespace, uniqueness: {scope: :cluster_id} validates :service_account_name, presence: true @@ -22,9 +22,9 @@ module Clusters delegate :api_url, to: :platform_kubernetes, allow_nil: true attr_encrypted :service_account_token, - mode: :per_attribute_iv, - key: Settings.attr_encrypted_db_key_base_truncated, - algorithm: 'aes-256-cbc' + mode: :per_attribute_iv, + key: Settings.attr_encrypted_db_key_base_truncated, + algorithm: "aes-256-cbc" scope :has_service_account_token, -> { where.not(encrypted_service_account_token: nil) } @@ -35,10 +35,10 @@ module Clusters def predefined_variables Gitlab::Ci::Variables::Collection.new.tap do |variables| variables - .append(key: 'KUBE_SERVICE_ACCOUNT', value: service_account_name.to_s) - .append(key: 'KUBE_NAMESPACE', value: namespace.to_s) - .append(key: 'KUBE_TOKEN', value: service_account_token.to_s, public: false) - .append(key: 'KUBECONFIG', value: kubeconfig, public: false, file: true) + .append(key: "KUBE_SERVICE_ACCOUNT", value: service_account_name.to_s) + .append(key: "KUBE_NAMESPACE", value: namespace.to_s) + .append(key: "KUBE_TOKEN", value: service_account_token.to_s, public: false) + .append(key: "KUBECONFIG", value: kubeconfig, public: false, file: true) end end @@ -75,7 +75,8 @@ module Clusters url: api_url, namespace: namespace, token: service_account_token, - ca_pem: ca_pem) + ca_pem: ca_pem + ) end end end |