Merge "Don't inherit Octavia-specific gtw class from openstack_gateway_*"
diff --git a/jenkins/client/job/deploy/k8s_control.yml b/jenkins/client/job/deploy/k8s_control.yml
new file mode 100644
index 0000000..7e915c2
--- /dev/null
+++ b/jenkins/client/job/deploy/k8s_control.yml
@@ -0,0 +1,34 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ deploy_k8s_control:
+ type: workflow-scm
+ name: deploy-k8s-control
+ display_name: "Deploy - k8s control"
+ discard:
+ build:
+ keep_num: 20
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: deploy-k8s-deployments.groovy
+ param:
+ # deployments and test settings
+ TARGET_MINIONS:
+ type: string
+ default: "E@k8s-ctl01.*"
+ description: "Salt compound target to match nodes to be updated [*, G@osfamily:debian]."
+ EXTRA_COMMAND:
+ type: string
+ default: ""
+ description: "Extra command to run before update"
+ # salt master
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
diff --git a/jenkins/client/job/docker/testing.yml b/jenkins/client/job/docker/testing.yml
index 3cdbe09..bf65dbc 100644
--- a/jenkins/client/job/docker/testing.yml
+++ b/jenkins/client/job/docker/testing.yml
@@ -39,7 +39,7 @@
default: "${_param:jenkins_gerrit_url}/mk/python-flask-hello"
IMAGE_BUILD_PARAMS:
type: string
- default: "--build-arg apt_repository='deb [arch=amd64] ${_param:jenkins_aptly_url}/trusty/ nightly extra' --build-arg apt_key_url=${_param:jenkins_aptly_url}/public.gpg"
+ default: "--build-arg apt_repository='deb [arch=amd64] ${_param:jenkins_aptly_url}/trusty/ nightly extra' --build-arg apt_key_url=${_param:jenkins_aptly_url}/public.gpg --no-cache"
IMAGE_BRANCH:
type: string
default: "{{branch}}"
diff --git a/kubernetes/control/flask_hello.yml b/kubernetes/control/flask_hello.yml
index e743dd0..f7b41e5 100644
--- a/kubernetes/control/flask_hello.yml
+++ b/kubernetes/control/flask_hello.yml
@@ -11,7 +11,7 @@
cluster: flask-hello
role: server
type: LoadBalancer
- replicas: 3
+ replicas: 1
kind: Deployment
apiVersion: extensions/v1beta1
ports:
@@ -20,6 +20,7 @@
container:
flask-hello:
image: ${_param:cicd_control_address}:5000/tcpcloud/python-flask-hello
+ image_pull_policy: Always
ports:
- port: 5000
name: flask-hello