diff --git a/Jenkinsfile b/Jenkinsfile index 8cd00e4..ab21b98 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ def registerCluster(){ ${HELM_HOME} --kube-insecure-skip-tls-verify repo list ${HELM_HOME} --kube-insecure-skip-tls-verify repo update ${HELM_HOME} --kube-insecure-skip-tls-verify list - ${HELM_HOME} --kube-insecure-skip-tls-verify upgrade -i ${release_name} ${params.REPO}/${helm_chart_name} --set namespace=${env.NAMESPACE} --version ${params.HELM_DP_CORE_INFRA_CHART_VERSION} -f deployments/${env.DEPLOYMENT_TYPE}/${values_file} + ${HELM_HOME} --kube-insecure-skip-tls-verify upgrade -i ${release_name} ${params.REPO}/${helm_chart_name} --set namespace=${env.NAMESPACE} --version ${params.HELM_DP_CORE_INFRA_CHART_VERSION} --reset-then-reuse-values -f deployments/${env.DEPLOYMENT_TYPE}/${values_file} ${HELM_HOME} --kube-insecure-skip-tls-verify list """ } @@ -48,7 +48,7 @@ def configureNamespace(){ ${HELM_HOME} --kube-insecure-skip-tls-verify version ${HELM_HOME} --kube-insecure-skip-tls-verify repo update ${HELM_HOME} --kube-insecure-skip-tls-verify list - ${HELM_HOME} --kube-insecure-skip-tls-verify upgrade -i ${release_name} ${params.REPO}/${helm_chart_name} --set namespace=${env.NAMESPACE} --version ${params.HELM_DP_CONFIG_NAMESPACE_CHART_VERSION} -f deployments/${env.DEPLOYMENT_TYPE}/${values_file} + ${HELM_HOME} --kube-insecure-skip-tls-verify upgrade -i ${release_name} ${params.REPO}/${helm_chart_name} --set namespace=${env.NAMESPACE} --version ${params.HELM_DP_CONFIG_NAMESPACE_CHART_VERSION} --reset-then-reuse-values -f deployments/${env.DEPLOYMENT_TYPE}/${values_file} ${HELM_HOME} --kube-insecure-skip-tls-verify list """ } @@ -105,8 +105,11 @@ pipeline { stage('Deploy') { steps { - configureNamespace() + + kubectl annotate --overwrite ingress provisioner-agent -n ${env.NAMESPACE} helm.sh/hook-delete-policy- helm.sh/hook- meta.helm.sh/release-name=dp-core-infrastructure meta.helm.sh/release-namespace=${env.NAMESPACE} registerCluster() + configureNamespace() + } }