forgot to save that file
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
import com.example.DockerBuilder
|
import com.example.DockerBuilder
|
||||||
|
|
||||||
def call(String appName, String helmChartPath, String helmRepoName,String helmChartVersion, Boolean useCustomDocker, Boolean useInsecureRegistry, Integer appPort) {
|
def call(String appName, String helmChartPath, String helmRepoName, String namespace, String helmChartVersion, Boolean useCustomDocker, Boolean useInsecureRegistry, Integer appPort) {
|
||||||
def dockerBuilder = new DockerBuilder()
|
def dockerBuilder = new DockerBuilder()
|
||||||
def containerName = useCustomDocker ? 'custom-docker' : 'docker'
|
def containerName = useCustomDocker ? 'custom-docker' : 'docker'
|
||||||
|
|
||||||
@@ -48,6 +48,7 @@ def call(String appName, String helmChartPath, String helmRepoName,String helmCh
|
|||||||
appName,
|
appName,
|
||||||
helmRepoName,
|
helmRepoName,
|
||||||
appName,
|
appName,
|
||||||
|
namespace,
|
||||||
helmChartVersion,
|
helmChartVersion,
|
||||||
env.KUBERNETES_API,
|
env.KUBERNETES_API,
|
||||||
env.KUBERNETES_TOKEN,
|
env.KUBERNETES_TOKEN,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
def call(String releaseName, String chartRepo, String chartName, String version, String kubeApi, String kubeToken, Map values = [:]) {
|
def call(String releaseName, String chartRepo, String chartName, String namespace, String version, String kubeApi, String kubeToken, Map values = [:]) {
|
||||||
container('helm') {
|
container('helm') {
|
||||||
def helmCommand = "helm install ${releaseName} ${chartRepo}/${chartName} --version ${version} --kube-apiserver ${kubeApi} --kube-token ${kubeToken} --kube-insecure-skip-tls-verify"
|
def helmCommand = "helm install ${releaseName} ${chartRepo}/${chartName} --namespace ${namespace} --version ${version} --kube-apiserver ${kubeApi} --kube-token ${kubeToken} --kube-insecure-skip-tls-verify"
|
||||||
|
|
||||||
values.each { key, value ->
|
values.each { key, value ->
|
||||||
helmCommand += " --set ${key}=${value}"
|
helmCommand += " --set ${key}=${value}"
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ def call(String projectName, Map config) {
|
|||||||
stage('Build and Deploy') {
|
stage('Build and Deploy') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
buildAndDeploy(projectName, config.helmChart, config.helmRepo, config.version, config.useCustomDocker, config.useInsecureRegistry, config.port)
|
buildAndDeploy(projectName, config.helmChart, config.helmRepo, config.namespace, config.version, config.useCustomDocker, config.useInsecureRegistry, config.port)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user