Fix virtual-network-cloud deployment job
The virtual-network-cloud deployment job is failing because it has not received necessary changes that have been made to the test-site. This change fixes the job by replicating the missing changes. This change also adds tolerations to pods that cannot be scheduled. Signed-off-by: Drew Walters <andrew.walters@att.com> Change-Id: I6e36085d87cef9b72ae497ab5678242839b3bc51
This commit is contained in:
parent
f9df233f6f
commit
641bc03f06
|
@ -1,4 +1,6 @@
|
|||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- upstream/default
|
||||
- upstream/default
|
||||
patchesStrategicMerge:
|
||||
- patches/toleration.yaml
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: sipcluster-controller-manager
|
||||
spec:
|
||||
template:
|
||||
spec:
|
||||
tolerations:
|
||||
- key: node-role.kubernetes.io/master
|
||||
effect: NoSchedule
|
|
@ -2,3 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
|||
kind: Kustomization
|
||||
resources:
|
||||
- upstream/default
|
||||
patchesStrategicMerge:
|
||||
- patches/toleration.yaml
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: vino-controller-manager
|
||||
spec:
|
||||
template:
|
||||
spec:
|
||||
tolerations:
|
||||
- key: node-role.kubernetes.io/master
|
||||
effect: NoSchedule
|
|
@ -1,5 +1,5 @@
|
|||
# This catalogue alone needs to be overriden at site level based on the
|
||||
# networkign requirement like HA
|
||||
# networking requirement like HA
|
||||
apiVersion: airshipit.org/v1alpha1
|
||||
kind: VariableCatalogue
|
||||
metadata:
|
||||
|
|
|
@ -5,8 +5,9 @@ resources:
|
|||
- ../../../../type/multi-tenant/shared/catalogues
|
||||
- hosts.yaml
|
||||
- ../encrypted/results
|
||||
- storage.yaml
|
||||
|
||||
patchesStrategicMerge:
|
||||
- versions-airshipctl.yaml
|
||||
- versions-treasuremap.yaml
|
||||
- networking.yaml
|
||||
- networking-ha.yaml
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
# This catalogue alone needs to be overriden at site level based on the
|
||||
# networkign requirement like HA
|
||||
apiVersion: airshipit.org/v1alpha1
|
||||
kind: VariableCatalogue
|
||||
metadata:
|
||||
name: networking-ha
|
||||
labels:
|
||||
airshipit.org/deploy-k8s: "false"
|
||||
vrrp:
|
||||
kubernetes:
|
||||
interface: bond.41
|
||||
virtual_ipaddress: 10.23.25.103
|
||||
ingress:
|
||||
interface: bond.41
|
||||
virtual_ipaddress: 10.23.25.104
|
|
@ -0,0 +1,37 @@
|
|||
# This makes a couple small networking tweaks that are specific to the
|
||||
# ephemeral cluster, on top of the target cluster networking definition.
|
||||
# These values can be overridden at the site, type, etc levels as appropriate.
|
||||
apiVersion: airshipit.org/v1alpha1
|
||||
kind: StorageCatalogue
|
||||
metadata:
|
||||
name: storage
|
||||
labels:
|
||||
airshipit.org/deploy-k8s: "false"
|
||||
spec:
|
||||
storage:
|
||||
useAllNodes: false # We define per node/per device configuration below
|
||||
useAllDevices: false # We define per node/per device configuration below
|
||||
nodes:
|
||||
- name: stl2r01s02
|
||||
devicePathFilter: "^/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:[3-8]:0"
|
||||
# Or you can use device filter
|
||||
# deviceFilter: "^/dev/sd[d-k]"
|
||||
- name: stl2r01s04
|
||||
devicePathFilter: "^/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:[3-8]:0"
|
||||
# Or you can use device filter
|
||||
# deviceFilter: "^/dev/sd[d-k]"
|
||||
- name: stl2r01s05
|
||||
devicePathFilter: "^/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:[3-8]:0"
|
||||
# Or you can use device filter
|
||||
# deviceFilter: "^/dev/sd[d-k]"
|
||||
- name: stl2r01s06
|
||||
devicePathFilter: "^/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:[3-8]:0"
|
||||
# Or you can use device filter
|
||||
# deviceFilter: "^/dev/sd[d-k]"
|
||||
- name: stl2r01s07
|
||||
devicePathFilter: "^/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:[3-8]:0"
|
||||
# Or you can use device filter
|
||||
# deviceFilter: "^/dev/sd[d-k]"
|
||||
mon:
|
||||
count: 1
|
||||
---
|
|
@ -9,5 +9,5 @@ spec:
|
|||
k8scontrol:
|
||||
# Host the image in a locally served location for CI
|
||||
cluster_controlplane_image:
|
||||
url: http://10.23.24.1:8099/target-image.qcow2
|
||||
checksum: http://10.23.24.1:8099/target-image.qcow2.md5sum
|
||||
url: http://10.23.24.101:80/images/control-plane.qcow2
|
||||
checksum: http://10.23.24.101:80/images/control-plane.qcow2.md5sum
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
apiVersion: airshipit.org/v1alpha1
|
||||
kind: VersionsCatalogue
|
||||
metadata:
|
||||
name: versions-treasuremap
|
||||
spec:
|
||||
files:
|
||||
k8scontrol:
|
||||
# Use locally generated images
|
||||
subcluster_controlplane_image:
|
||||
url: http://10.23.24.1:8099/target-image.qcow2
|
||||
checksum: http://10.23.24.1:8099/target-image.qcow2.md5sum
|
|
@ -21,14 +21,13 @@
|
|||
- airship-treasuremap-validate-site-docs
|
||||
# - airship-treasuremap-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up
|
||||
- airship-treasuremap-deploy-test-site
|
||||
- airship-treasuremap-deploy-virtual-network-cloud:
|
||||
voting: false
|
||||
- airship-treasuremap-deploy-virtual-network-cloud
|
||||
gate:
|
||||
jobs:
|
||||
- noop
|
||||
- airship-treasuremap-validate-site-docs
|
||||
- airship-treasuremap-deploy-test-site
|
||||
# - airship-treasuremap-deploy-virtual-network-cloud
|
||||
- airship-treasuremap-deploy-virtual-network-cloud
|
||||
# - airship-treasuremap-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up
|
||||
post:
|
||||
jobs:
|
||||
|
|
Loading…
Reference in New Issue