Upgrade Jenkins CI with latest capv (antrea-io#681)

* new template config file * new setup and cleanup scripts
antoninbas · Jun 16, 2020 · 6391ccc · 6391ccc
1 parent c912180
commit 6391ccc
Show file tree

Hide file tree

Showing 8 changed files with 281 additions and 326 deletions.
diff --git a/ci/cluster-api/vsphere/templates/cluster.yaml b/ci/cluster-api/vsphere/templates/cluster.yaml
@@ -1,4 +1,4 @@
-apiVersion: cluster.x-k8s.io/v1alpha2
+apiVersion: cluster.x-k8s.io/v1alpha3
 kind: Cluster
 metadata:
   name: CLUSTERNAME
@@ -12,13 +12,44 @@ spec:
     services:
       cidrBlocks:
       - 100.64.0.0/13
+  controlPlaneRef:
+    apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
+    kind: KubeadmControlPlane
+    name: CLUSTERNAME
   infrastructureRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
     kind: VSphereCluster
     name: CLUSTERNAME
-    namespace: CLUSTERNAMESPACE
 ---
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
+kind: HAProxyLoadBalancer
+metadata:
+  labels:
+    cluster.x-k8s.io/cluster-name: CLUSTERNAME
+  name: CLUSTERNAME
+  namespace: CLUSTERNAMESPACE
+spec:
+  user:
+    authorizedKeys:
+    - SSHAUTHORIZEDKEYS
+    name: capvs
+  virtualMachineConfiguration:
+    cloneMode: linkedClone
+    datacenter: DATACENTERNAME
+    datastore: WorkloadDatastore
+    diskGiB: 25
+    folder: antrea
+    memoryMiB: 8192
+    network:
+      devices:
+      - dhcp4: true
+        networkName: NETWORKNAME
+    numCPUs: 2
+    resourcePool: RESOURCEPOOLPATH
+    server: VCENTERNAME
+    template: capv-haproxy-v0.6.3
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
 kind: VSphereCluster
 metadata:
   name: CLUSTERNAME
@@ -33,13 +64,13 @@ spec:
       name: NETWORKNAME
     providerConfig:
       cloud:
-        controllerImage: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.1.0
+        controllerImage: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.0.0
       storage:
         attacherImage: quay.io/k8scsi/csi-attacher:v1.1.1
-        controllerImage: gcr.io/cloud-provider-vsphere/csi/release/driver:v1.0.1
+        controllerImage: gcr.io/cloud-provider-vsphere/csi/release/driver:v1.0.2
         livenessProbeImage: quay.io/k8scsi/livenessprobe:v1.1.0
-        metadataSyncerImage: gcr.io/cloud-provider-vsphere/csi/release/syncer:v1.0.1
-        nodeDriverImage: gcr.io/cloud-provider-vsphere/csi/release/driver:v1.0.1
+        metadataSyncerImage: gcr.io/cloud-provider-vsphere/csi/release/syncer:v1.0.2
+        nodeDriverImage: gcr.io/cloud-provider-vsphere/csi/release/driver:v1.0.2
         provisionerImage: quay.io/k8scsi/csi-provisioner:v1.2.1
         registrarImage: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
     virtualCenter:
@@ -49,6 +80,136 @@ spec:
       datacenter: DATACENTERNAME
       datastore: WorkloadDatastore
       folder: antrea
-      resourcePool: 'RESOURCEPOOLPATH'
+      resourcePool: RESOURCEPOOLPATH
       server: VCENTERNAME
+  loadBalancerRef:
+    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
+    kind: HAProxyLoadBalancer
+    name: CLUSTERNAME
   server: VCENTERNAME
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
+kind: VSphereMachineTemplate
+metadata:
+  name: CLUSTERNAME
+  namespace: CLUSTERNAMESPACE
+spec:
+  template:
+    spec:
+      cloneMode: linkedClone
+      datacenter: DATACENTERNAME
+      datastore: WorkloadDatastore
+      diskGiB: 25
+      folder: antrea
+      memoryMiB: 8192
+      network:
+        devices:
+        - dhcp4: true
+          networkName: NETWORKNAME
+      numCPUs: 2
+      resourcePool: RESOURCEPOOLPATH
+      server: VCENTERNAME
+      template: ubuntu-1804-kube-v1.17.3
+---
+apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
+kind: KubeadmControlPlane
+metadata:
+  name: CLUSTERNAME
+  namespace: CLUSTERNAMESPACE
+spec:
+  infrastructureTemplate:
+    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
+    kind: VSphereMachineTemplate
+    name: CLUSTERNAME
+  kubeadmConfigSpec:
+    clusterConfiguration:
+      apiServer:
+        extraArgs:
+          cloud-provider: external
+      controllerManager:
+        extraArgs:
+          cloud-provider: external
+    initConfiguration:
+      nodeRegistration:
+        criSocket: /var/run/containerd/containerd.sock
+        kubeletExtraArgs:
+          cloud-provider: external
+        name: '{{ ds.meta_data.hostname }}'
+    joinConfiguration:
+      nodeRegistration:
+        criSocket: /var/run/containerd/containerd.sock
+        kubeletExtraArgs:
+          cloud-provider: external
+        name: '{{ ds.meta_data.hostname }}'
+    preKubeadmCommands:
+    - hostname "{{ ds.meta_data.hostname }}"
+    - echo "::1         ipv6-localhost ipv6-loopback" >/etc/hosts
+    - echo "127.0.0.1   localhost" >>/etc/hosts
+    - echo "127.0.0.1   {{ ds.meta_data.hostname }}" >>/etc/hosts
+    - echo "{{ ds.meta_data.hostname }}" >/etc/hostname
+    useExperimentalRetryJoin: true
+    users:
+    - name: capv
+      sshAuthorizedKeys:
+      - SSHAUTHORIZEDKEYS
+      sudo: ALL=(ALL) NOPASSWD:ALL
+  replicas: 1
+  version: v1.17.3
+---
+apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
+kind: KubeadmConfigTemplate
+metadata:
+  name: CLUSTERNAME-md-0
+  namespace: CLUSTERNAMESPACE
+spec:
+  template:
+    spec:
+      joinConfiguration:
+        nodeRegistration:
+          criSocket: /var/run/containerd/containerd.sock
+          kubeletExtraArgs:
+            cloud-provider: external
+          name: '{{ ds.meta_data.hostname }}'
+      preKubeadmCommands:
+      - hostname "{{ ds.meta_data.hostname }}"
+      - echo "::1         ipv6-localhost ipv6-loopback" >/etc/hosts
+      - echo "127.0.0.1   localhost" >>/etc/hosts
+      - echo "127.0.0.1   {{ ds.meta_data.hostname }}" >>/etc/hosts
+      - echo "{{ ds.meta_data.hostname }}" >/etc/hostname
+      useExperimentalRetryJoin: true
+      users:
+      - name: capv
+        sshAuthorizedKeys:
+        - SSHAUTHORIZEDKEYS
+        sudo: ALL=(ALL) NOPASSWD:ALL
+---
+apiVersion: cluster.x-k8s.io/v1alpha3
+kind: MachineDeployment
+metadata:
+  labels:
+    cluster.x-k8s.io/cluster-name: CLUSTERNAME
+  name: CLUSTERNAME-md-0
+  namespace: CLUSTERNAMESPACE
+spec:
+  clusterName: CLUSTERNAME
+  replicas: 2
+  selector:
+    matchLabels:
+      cluster.x-k8s.io/cluster-name: CLUSTERNAME
+  template:
+    metadata:
+      labels:
+        cluster.x-k8s.io/cluster-name: CLUSTERNAME
+    spec:
+      bootstrap:
+        configRef:
+          apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
+          kind: KubeadmConfigTemplate
+          name: CLUSTERNAME-md-0
+      clusterName: CLUSTERNAME
+      infrastructureRef:
+        apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
+        kind: VSphereMachineTemplate
+        name: CLUSTERNAME
+      version: v1.17.3
+
diff --git a/ci/cluster-api/vsphere/templates/controlplane.yaml b/ci/cluster-api/vsphere/templates/controlplane.yaml
diff --git a/ci/cluster-api/vsphere/templates/machinedeployment.yaml b/ci/cluster-api/vsphere/templates/machinedeployment.yaml
diff --git a/ci/cluster-api/vsphere/templates/namespace.yaml b/ci/cluster-api/vsphere/templates/namespace.yaml
@@ -2,7 +2,7 @@
   "apiVersion": "v1",
   "kind": "Namespace",
   "metadata": {
-    "name": "NAMESPACENAME",
+    "name": "CLUSTERNAMESPACE",
     "labels": {
       "antrea-ci": "true"
     }

diff --git a/ci/jenkins/README.md b/ci/jenkins/README.md
@@ -9,8 +9,9 @@ At the moment these Jenkins jobs are running on VMC (VMware on AWS). As a
 result, all jobs' results and details are available publicly
 [here](https://jenkins.antrea-ci.rocks/). We are using Cluster API for vSphere
 ([CAPV](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere)) for
-creating and managing workload clusters. For each job build, a completely new
-workload cluster will be created. As soon as the build finishes, the cluster
+creating and managing workload clusters. The management cluster is a kind cluster
+on Jenkins node. For each job build, a completely new workload cluster will be created
+by this management cluster. As soon as the build finishes, the cluster
 should be deleted. This ensures that all tests are run on a clean testbed.
 
 ### List of Jenkins jobs