citasks 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 957bcedfb3611c100ccab26a6d4f4b568f81e239
-  data.tar.gz: 41d396cf38779faa1140efce7fb14e8a872b718d
+  metadata.gz: f3d41bf164110e3e84deac18d24e4d0f55a31081
+  data.tar.gz: 59e7113f5f58269dc6208b5e427861c5195c5bfa
 SHA512:
-  metadata.gz: 7b2221814042be344743e0adb8510b75ba99446c434bf4bce40340fe582f39cf7ce2296acd63eac5580517a22e38ea0d6960204580c9756d12326f91780746fe
-  data.tar.gz: 1f5b95da5d069ab0c8def0825e245441d2180c159daa52284d4aa10e4a2100a14d74ef97e7ce506940a7bc2d29fa5a0589265091ea83539d69d9185be3b44a68
+  metadata.gz: 91261b3b0c0c5acf3a633470a214a3f679590881279afe74ab84452a02f785cef050ae72cee8c55ac5adb4916e931661668b99e726bb334117e72c521dca86b5
+  data.tar.gz: a0486b4b83ea0000c9019ee565301d64bbe44b93f6a9d9c9a3bb22207ef92313324da1bdbd938a7cf6fd7817aeb10dae1d1369508bcd11b4a51da79996b14ba7

data/lib/citasks/ci_lib.rb

@@ -30,10 +30,14 @@ module JenkinsTools
   
   # git_repo_url = http://virtuous-porcupine-gitlab-ce/wenzm/icp-static-web.git, gitlab-wenzm-password
   def self.gen_job_xml job_name, xml_file_name, git_repo_url, repo_credential_id_in_jenkins, secret_token=nil
-    secret_token = token_shared_persistently if secret_token.nil?
+    enable_secret_token = ENV["JENKIN_PROJECT_ENDPOINT_AUTHENTICATION"].upcase == "TRUE"
+    
+    if enable_secret_token
+      secret_token = token_shared_persistently if secret_token.nil?
+    end
 
     token_to_trigger_build_remotely = SecureRandom.uuid
-    _write xml_file_name, <<~EOF
+    erb = ERB.new <<~EOF
       <?xml version='1.0' encoding='UTF-8'?>
       <flow-definition plugin="#{WORKFLOW_PLUGIN}">
         <actions/>
@@ -61,7 +65,9 @@ module JenkinsTools
                 <includeBranchesSpec></includeBranchesSpec>
                 <excludeBranchesSpec></excludeBranchesSpec>
                 <targetBranchRegex></targetBranchRegex>
-                <secretToken>#{secret_token}</secretToken>
+                <% if enable_secret_token %>
+                <secretToken><%= secret_token %></secretToken>
+                <% end %>
               </com.dabsquared.gitlabjenkins.GitLabPushTrigger>
             </triggers>
           </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
@@ -92,6 +98,8 @@ module JenkinsTools
         <disabled>false</disabled>
       </flow-definition>
     EOF
+
+    _write xml_file_name, erb.result(binding)
   end
 
   def self.gen_jenkins_file
@@ -212,13 +220,15 @@ module Builder
     _write ".env.build", <<~EOF
       IMAGE_NAME=#{app_name}
       
-      PRIVATE_DOCKER_REGISTRY_NAME=master.cfc
+      PRIVATE_DOCKER_REGISTRY_NAME=mycluster.icp
       PRIVATE_DOCKER_REGISTRY_PORT=8500
       PRIVATE_DOCKER_REGISTRY_IP=#{ENV["ICP_MASTER_IP"]}
-      PRIVATE_DOCKER_REGISTRY_NAMESPACE=default
+      PRIVATE_DOCKER_REGISTRY_NAMESPACE=#{ENV["PRIVATE_DOCKER_REGISTRY_NAMESPACE"]}
       
       PRIVATE_DOCKER_REGISTRY_USER=admin
       PRIVATE_DOCKER_REGISTRY_USER_PASSWORD=admin
+      
+      K8S_NAMESPACE=#{ENV["K8S_NAMESPACE"]}
     EOF
   end
 
@@ -315,16 +325,8 @@ module Builder
           end
         end
 
-        def self.deploy_to_k8s deployment, yaml_file, image_name, new_image_name
-          if Shell.test %Q(kubectl get deployment | grep \#{deployment} )
-            Shell.run %Q(kubectl apply -f \#{yaml_file})
-            Shell.run %Q(kubectl set image deployment/\#{deployment} \#{image_name}=\#{new_image_name})
-
-            Shell.run %Q(kubectl rollout status deployment/\#{deployment})
-          else
-            puts "no deployment yet. create it"
-            Shell.run %Q(kubectl create -f \#{yaml_file} --record)
-          end
+        def self.deploy_to_k8s namespace, deployment, yaml_file, image_name, new_image_name
+          Shell.run %Q(kubectl apply -f \#{yaml_file})
         end
       end
     EOF
@@ -373,7 +375,7 @@ module Builder
           KubeTools.create_new_yaml yaml_template_file, yaml_file, data
 
           deployment = image_name
-          KubeTools.deploy_to_k8s deployment, yaml_file, image_name, full_new_image_name
+          KubeTools.deploy_to_k8s ENV["K8S_NAMESPACE"], deployment, yaml_file, image_name, full_new_image_name
 
         end
       end    
@@ -392,11 +394,12 @@ module Builder
     end
   end
 
-  def self.create_k8_file app_name
+  def self.create_k8_file namespace, app_name
     _write "#{app_name}.k8.template.yaml", <<~EOF
       apiVersion: extensions/v1beta1
       kind: Deployment
       metadata:
+        namespace: #{namespace}
         name: #{app_name}
         labels:
           app: #{app_name}
@@ -417,6 +420,7 @@ module Builder
       apiVersion: v1
       kind: Service
       metadata:
+        namespace: #{namespace}
         name: #{app_name}
         labels:
           app: #{app_name}
@@ -433,6 +437,7 @@ module Builder
       apiVersion: extensions/v1beta1
       kind: Ingress
       metadata:
+        namespace: #{namespace}
         name: #{app_name}-ingress
         labels:
           app: #{app_name}-ingress

data/lib/citasks.rb

@@ -22,13 +22,17 @@ namespace "init" do
         JENKINS_USER = wenzm
         JENKINS_USER_API_TOKEN = f432de6a2fbeaaf58757f76194dcd825
 
+        JENKIN_PROJECT_ENDPOINT_AUTHENTICATION = false
+
         JOB_NAME=#{project}
         REPO_NAME=#{project}
 
         COMPILER_DOCKER_IMAGE=maven:3.5-jdk-8
 
         #for private docker registry
-        ICP_MASTER_IP=192.168.10.100      
+        ICP_MASTER_IP=192.168.10.100
+        
+        K8S_NAMESPACE=default
       EOF
 
       fh.puts content
@@ -67,7 +71,7 @@ namespace "Jenkins" do
     Builder.create_env job_name
     Builder.create_lib_files
     Builder.create_rakefile
-    Builder.create_k8_file job_name
+    Builder.create_k8_file ENV["K8S_NAMESPACE"] || "default",job_name
     Builder.create_dockerfile 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citasks
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Zhimin Wen