kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use email on the account

Browse source
This commit is contained in:
Amit Rathi 2018-11-13 20:36:06 +05:30
parent 9d91d79c6b
commit 631ab89885
5 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/clusters/components/applications.vue
View file

@ -81,9 +81,6 @@ export default {
ingressInstalled() {
return this.applications.ingress.status === APPLICATION_STATUS.INSTALLED;
},
certManagerInstalled() {
return this.applications.cert_manager.status === APPLICATION_STATUS.INSTALLED;
},
ingressExternalIp() {
return this.applications.ingress.externalIp;
},

17
app/models/clusters/applications/cert_manager.rb
View file

@ -33,10 +33,17 @@ module Clusters
rbac: cluster.platform_kubernetes_rbac?,
chart: chart,
files: files.merge!(cluster_issuer_file),
postinstall: post_install_script
postinstall: post_install_script,
application_flags: install_command_flags
)
end
def install_command_flags
['--set', 'ingressShim.defaultIssuerName=letsencrypt-prod'] +
['--set', 'ingressShim.defaultIssuerKind=ClusterIssuer'] +
['--set', 'rbac.create=false']
end
private
def post_install_script
@ -45,10 +52,16 @@ module Clusters
def cluster_issuer_file
{
'cluster_issuer.yaml': File.read(cluster_issuer_file_path)
'cluster_issuer.yaml': cluster_issuer_yaml_content
}
end
def cluster_issuer_yaml_content
data = YAML.load_file(cluster_issuer_file_path)
data["spec"]["acme"]["email"] = self.email
YAML.dump(data)
end
def cluster_issuer_file_path
"#{Rails.root}/vendor/cert_manager/cluster_issuer.yaml"
end

4
config/cert_manager/cluster_issuer.yaml
View file

@ -5,7 +5,7 @@ metadata:
spec:
acme:
server: https://acme-v02.api.letsencrypt.org/directory
email: hello@amirathi.com
email: my-email@example.com
privateKeySecretRef:
name: letsencrypt-prod
http01: {}
http01: {}

11
lib/gitlab/kubernetes/helm/install_command.rb
View file

@ -4,9 +4,9 @@ module Gitlab
class InstallCommand
include BaseCommand
attr_reader :name, :files, :chart, :version, :repository, :preinstall, :postinstall
attr_reader :name, :files, :chart, :version, :repository, :preinstall, :postinstall, :application_flags
def initialize(name:, chart:, files:, rbac:, version: nil, repository: nil, preinstall: nil, postinstall: nil)
def initialize(name:, chart:, files:, rbac:, version: nil, repository: nil, preinstall: nil, postinstall: nil, application_flags: [])
@name = name
@chart = chart
@version = version
@ -15,6 +15,7 @@ module Gitlab
@repository = repository
@preinstall = preinstall
@postinstall = postinstall
@application_flags = application_flags
end
def generate_script
@ -64,16 +65,14 @@ module Gitlab
name_flag = ['--name', name]
namespace_flag = ['--namespace', Gitlab::Kubernetes::Helm::NAMESPACE]
value_flag = ['-f', "/data/helm/#{name}/config/values.yaml"]
a = ['--set', 'ingressShim.defaultIssuerName=letsencrypt-prod']
b = ['--set', 'ingressShim.defaultIssuerKind=ClusterIssuer']
c = ['--set', 'rbac.create=false']
name_flag +
optional_tls_flags +
optional_version_flag +
optional_rbac_create_flag +
namespace_flag +
value_flag + a + b + c
value_flag +
application_flags
end
def optional_rbac_create_flag

6
vendor/jupyter/values.yaml vendored
View file

@ -19,6 +19,6 @@ singleuser:
command: ["sh", "-c", "git clone https://gitlab.com/gitlab-org/nurtch-demo.git DevOps-Runbook-Demo || true"]
ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: "nginx"
enabled: true
annotations:
kubernetes.io/ingress.class: "nginx"