Feature/eks

src/org/ods/component/AbstractDeploymentStrategy.groovy

@@ -32,23 +32,6 @@ abstract class AbstractDeploymentStrategy implements IDeploymentStrategy {
         originalVersions
     }
 
-    protected findOrCreateImageStream(String targetProject, String image) {
-        try {
-            openShift.findOrCreateImageStream(targetProject, image)
-        } catch (Exception ex) {
-            steps.error "Could not find/create ImageStream ${image} in ${targetProject}. Error was: ${ex}"
-        }
-    }
-
-    protected void retagImages(String targetProject, Set<String> images) {
-        images.each { image ->
-            findOrCreateImageStream(targetProject, image)
-            openShift.importImageTagFromProject(
-                targetProject, image, context.cdProject, options.imageTag, options.imageTag
-            )
-        }
-    }
-
     @TypeChecked(TypeCheckingMode.SKIP)
     protected Set<String> getBuiltImages() {
         context.buildArtifactURIs.builds.keySet().findAll { it ->

src/org/ods/component/DeploymentConfig.groovy

@@ -0,0 +1,78 @@
+
+package org.ods.component
+
+class DeploymentConfig {
+
+    public void updateCommonConfig(IContext context, Map<String, Object> config) {
+        if (!config.selector) {
+            config.selector = context.selector
+        }
+        if (!config.imageTag) {
+            config.imageTag = context.shortGitCommit
+        }
+        if (!config.deployTimeoutMinutes) {
+            config.deployTimeoutMinutes = context.openshiftRolloutTimeout ?: 15
+        }
+        if (!config.deployTimeoutRetries) {
+            config.deployTimeoutRetries = context.openshiftRolloutTimeoutRetries ?: 5
+        }
+    }
+
+    public void updateHelmConfig(IContext context, Map<String, Object> config){
+        if (!config.chartDir) {
+            config.chartDir = 'chart'
+        }
+        if (!config.containsKey('helmReleaseName')) {
+            config.helmReleaseName = context.componentId
+        }
+        if (!config.containsKey('helmValues')) {
+            config.helmValues = [:]
+        }
+        if (!config.containsKey('helmValuesFiles')) {
+            config.helmValuesFiles = [ 'values.yaml' ]
+        }
+        if (!config.containsKey('helmEnvBasedValuesFiles')) {
+            config.helmEnvBasedValuesFiles = []
+        }
+        if (!config.containsKey('helmDefaultFlags')) {
+            config.helmDefaultFlags = ['--install', '--atomic']
+        }
+        if (!config.containsKey('helmAdditionalFlags')) {
+            config.helmAdditionalFlags = []
+        }
+        if (!config.containsKey('helmDiff')) {
+            config.helmDiff = true
+        }
+        if (!config.helmPrivateKeyCredentialsId) {
+            config.helmPrivateKeyCredentialsId = "${context.cdProject}-helm-private-key"
+        }
+    }
+
+    @NonCPS
+    public static void updateTailorConfig(IContext context, Map<String, Object> config) {
+        if (!config.openshiftDir) {
+                config.openshiftDir = 'openshift'
+        }
+        if (!config.tailorPrivateKeyCredentialsId) {
+            config.tailorPrivateKeyCredentialsId = "${context.cdProject}-tailor-private-key"
+        }
+        if (!config.tailorSelector) {
+            config.tailorSelector = config.selector
+        }
+        if (!config.containsKey('tailorVerify')) {
+            config.tailorVerify = true
+        }
+        if (!config.containsKey('tailorExclude')) {
+            config.tailorExclude = 'bc,is'
+        }
+        if (!config.containsKey('tailorParamFile')) {
+            config.tailorParamFile = '' // none apart the automatic param file
+        }
+        if (!config.containsKey('tailorPreserve')) {
+            config.tailorPreserve = [] // do not preserve any paths in live config
+        }
+        if (!config.containsKey('tailorParams')) {
+            config.tailorParams = []
+        }
+    }
+}

src/org/ods/component/HelmDeploymentStrategy.groovy

@@ -18,6 +18,8 @@ class HelmDeploymentStrategy extends AbstractDeploymentStrategy {
     private final JenkinsService jenkins
     private final ILogger logger
     private final IPipelineSteps steps
+    private final IImageRepository imageRepository
+
     // assigned in constructor
     private final RolloutOpenShiftDeploymentOptions options
 
@@ -28,8 +30,13 @@ class HelmDeploymentStrategy extends AbstractDeploymentStrategy {
         Map<String, Object> config,
         OpenShiftService openShift,
         JenkinsService jenkins,
+        IImageRepository imageRepository,
         ILogger logger
     ) {
+            // TODO
+       // DeploymentConfig deploymentConfig = new DeploymentConfig()
+        // deploymentConfig.updateCommonConfig(context, config)
+        // deploymentConfig.updateHelmConfig(context, config)
         if (!config.selector) {
             config.selector = context.selector
         }
@@ -42,7 +49,6 @@ class HelmDeploymentStrategy extends AbstractDeploymentStrategy {
         if (!config.deployTimeoutRetries) {
             config.deployTimeoutRetries = context.openshiftRolloutTimeoutRetries ?: 5
         }
-        // Helm options
         if (!config.chartDir) {
             config.chartDir = 'chart'
         }
@@ -53,7 +59,7 @@ class HelmDeploymentStrategy extends AbstractDeploymentStrategy {
             config.helmValues = [:]
         }
         if (!config.containsKey('helmValuesFiles')) {
-            config.helmValuesFiles = ['values.yaml']
+            config.helmValuesFiles = [ 'values.yaml' ]
         }
         if (!config.containsKey('helmEnvBasedValuesFiles')) {
             config.helmEnvBasedValuesFiles = []
@@ -70,28 +76,31 @@ class HelmDeploymentStrategy extends AbstractDeploymentStrategy {
         if (!config.helmPrivateKeyCredentialsId) {
             config.helmPrivateKeyCredentialsId = "${context.cdProject}-helm-private-key"
         }
+
         this.context = context
         this.logger = logger
         this.steps = steps
 
         this.options = new RolloutOpenShiftDeploymentOptions(config)
         this.openShift = openShift
         this.jenkins = jenkins
+        this.imageRepository = imageRepository
     }
 
     @Override
-    Map<String, List<PodData>> deploy() {
-        if (!context.environment) {
-            logger.warn 'Skipping because of empty (target) environment ...'
-            return [:]
+    Map<String, List<PodData>> deploy() {      
+        // Maybe we need to deploy to another namespace (ie we want to deploy a monitoring stack into a specific namespace)
+        def targetProject = context.targetProject
+        if (options.helmValues['namespaceOverride']) {
+            targetProject = options.helmValues['namespaceOverride']
+            logger.info("Override namespace deployment to ${targetProject} ") 
         }
-
-        // Tag images which have been built in this pipeline from cd project into target project
-        retagImages(context.targetProject, getBuiltImages())
+        logger.info("Retagging images for ${targetProject} ")
+        imageRepository.retagImages(targetProject, getBuiltImages(), options.imageTag, options.imageTag)
 
         logger.info("Rolling out ${context.componentId} with HELM, selector: ${options.selector}")
-        helmUpgrade(context.targetProject)
-        HelmStatus helmStatus = openShift.helmStatus(context.targetProject, options.helmReleaseName)
+        helmUpgrade(targetProject)
+        HelmStatus helmStatus = openShift.helmStatus(targetProject, options.helmReleaseName)
         if (logger.debugMode) {
             def helmStatusMap = helmStatus.toMap()
             logger.debug("${this.class.name} -- HELM STATUS: ${helmStatusMap}")
@@ -101,17 +110,16 @@ class HelmDeploymentStrategy extends AbstractDeploymentStrategy {
         // // we assume that Helm does "Deployment" that should work for most
         // // cases since they don't have triggers.
         // metadataSvc.updateMetadata(false, deploymentResources)
-        def rolloutData = getRolloutData(helmStatus)
+        def rolloutData = getRolloutData(helmStatus, targetProject)
         return rolloutData
     }
 
-    private void helmUpgrade(String targetProject) {
+    private void helmUpgrade(String targetProject) {        
         steps.dir(options.chartDir) {
             jenkins.maybeWithPrivateKeyCredentials(options.helmPrivateKeyCredentialsId) { String pkeyFile ->
                 if (pkeyFile) {
                     steps.sh(script: "gpg --import ${pkeyFile}", label: 'Import private key into keyring')
-                }
-
+                }              
                 // we add two things persistent - as these NEVER change (and are env independent)
                 options.helmValues['registry'] = context.clusterRegistryAddress
                 options.helmValues['componentId'] = context.componentId
@@ -162,7 +170,7 @@ class HelmDeploymentStrategy extends AbstractDeploymentStrategy {
     // ]
     @TypeChecked(TypeCheckingMode.SKIP)
     private Map<String, List<PodData>> getRolloutData(
-        HelmStatus helmStatus
+        HelmStatus helmStatus, String targetProject
     ) {
         Map<String, List<PodData>> rolloutData = [:]
 
@@ -175,7 +183,7 @@ class HelmDeploymentStrategy extends AbstractDeploymentStrategy {
                     [
                         type: 'helm',
                         selector: options.selector,
-                        namespace: context.targetProject,
+                        namespace: targetProject,
                         chartDir: options.chartDir,
                         helmReleaseName: options.helmReleaseName,
                         helmEnvBasedValuesFiles: options.helmEnvBasedValuesFiles,
@@ -187,14 +195,14 @@ class HelmDeploymentStrategy extends AbstractDeploymentStrategy {
                     ]
                 )
                 def podDataContext = [
-                    "targetProject=${context.targetProject}",
+                    "targetProject=${targetProject}",
                     "selector=${options.selector}",
                     "name=${name}",
                 ]
                 def msgPodsNotFound = "Could not find 'running' pod(s) for '${podDataContext.join(', ')}'"
                 List<PodData> podData = null
                 for (def i = 0; i < options.deployTimeoutRetries; i++) {
-                    podData = openShift.checkForPodData(context.targetProject, options.selector, name)
+                    podData = openShift.checkForPodData(targetProject, options.selector, name)
                     if (podData) {
                         break
                     }

src/org/ods/component/IImageRepository.groovy

@@ -0,0 +1,7 @@
+package org.ods.component
+
+interface IImageRepository {
+
+    void retagImages(String targetProject, Set<String> images,  String sourceTag, String targetTag)
+
+}

src/org/ods/component/ImageRepositoryEKS.groovy

@@ -0,0 +1,56 @@
+package org.ods.component
+
+import org.ods.services.EKSService
+import org.ods.util.IPipelineSteps
+import org.ods.component.IContext
+
+class ImageRepositoryEKS implements IImageRepository {
+
+    // Constructor arguments
+    private final IPipelineSteps steps
+    private final IContext context
+    private final EKSService eks
+
+    private final String ocToken
+    private final String awsPassword
+
+    @SuppressWarnings(['AbcMetric', 'CyclomaticComplexity', 'ParameterCount'])
+    ImageRepositoryEKS(
+        IPipelineSteps steps,
+        IContext context,
+        EKSService eks,
+        String ocToken,
+        String awsPassword
+    ) {
+        this.steps = steps
+        this.context = context
+        this.eks = eks
+        this.ocToken = ocToken
+        this.awsPassword = awsPassword        
+    }
+
+    public void retagImages(String targetProject, Set<String> images,  String sourceTag, String targetTag) {
+        images.each { image ->
+            eks.createRepository(image)
+            copyImage(image, context, sourceTag, targetTag)
+        }
+    }
+
+   private int copyImage(image, context, sourceTag, targetTag) {
+        String ocCredentials="jenkins:$ocToken"
+        String awsCredentials="AWS:$awsPassword"
+        String dockerSource="docker://${context.config.dockerRegistry}/${context.cdProject}/${image}:${sourceTag}"
+        String awsTarget="docker://${eks.getECRRegistry()}/${image}:${targetTag}"
+
+        return steps.sh(
+            script: """
+                skopeo copy \
+                --src-tls-verify=false --src-creds "${ocCredentials}"\
+                --dest-tls-verify=false --dest-creds "${awsCredentials}"\
+                $dockerSource $awsTarget
+            """,
+            returnStatus: true,
+            label: "Copy image to awsTarget ${awsTarget}"
+        ) as int
+    }
+}

src/org/ods/component/ImageRepositoryOpenshift.groovy

@@ -0,0 +1,40 @@
+package org.ods.component
+
+import org.ods.services.OpenShiftService
+import org.ods.util.IPipelineSteps
+
+class ImageRepositoryOpenshift implements IImageRepository {
+
+    // Constructor arguments
+    private final IPipelineSteps steps
+    private final IContext context
+    private final OpenShiftService openShift
+
+    @SuppressWarnings(['AbcMetric', 'CyclomaticComplexity', 'ParameterCount'])
+    ImageRepositoryOpenshift(
+        IPipelineSteps steps,
+        IContext context,
+        OpenShiftService openShift
+    ) {
+        this.steps = steps
+        this.context = context
+        this.openShift = openShift
+    }
+
+    public void retagImages(String targetProject, Set<String> images,  String sourceTag, String targetTag) {
+        images.each { image ->
+            findOrCreateImageStream(targetProject, image)
+            openShift.importImageTagFromProject(
+                targetProject, image, context.cdProject, sourceTag, targetTag
+            )
+        }
+    }
+
+    private findOrCreateImageStream(String targetProject, String image) {
+        try {
+            openShift.findOrCreateImageStream(targetProject, image)
+        } catch (Exception ex) {
+            steps.error "Could not find/create ImageStream ${image} in ${targetProject}. Error was: ${ex}"
+        }
+    }
+}