Skip to content
This repository was archived by the owner on Feb 6, 2025. It is now read-only.

Merge Experimental v5 #1154

Merged
merged 19 commits into from
Jun 11, 2020
Merged

Merge Experimental v5 #1154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5fcf6d0
Update k8s libraries
May 14, 2020
de56e32
Update certificates configuration ussage
May 14, 2020
8346223
Add context ussage to all client calls
May 14, 2020
8f7d820
refactor config defaulting for kubeadmn 1.18
May 26, 2020
3960d69
deletes config test, obsolete
May 29, 2020
d5ab203
validate error on function VerifyUnmarshalStrictC
May 29, 2020
afa4139
Require go version 1.13
cmurphy Mar 13, 2020
e5f4461
AutoYaST adapted for CaaSP 5 based on SLE-15-SP2
thehejik Jun 4, 2020
8bd9a4a
Switch daily job version branches
Jun 8, 2020
3dc9fbc
Adapting terraform vars file for SLE15-SP2
davidcassany May 25, 2020
e7a6079
Switch to v5 CR container images
dirkmueller Jun 7, 2020
199630c
Merge pull request #997 from cmurphy/go-1.13
davidcassany Jun 8, 2020
29c60bc
Merge pull request #1107 from chentex/upgrade-k8s-libraries
davidcassany Jun 8, 2020
e14f2d8
Merge pull request #1132 from davidcassany/initial_caasp_v5_tests
davidcassany Jun 8, 2020
7bcac54
Merge pull request #1138 from thehejik/master
jordimassaguerpla Jun 9, 2020
1c92dba
Merge pull request #1141 from pablochacin/switch-daily-jobs-branches
jordimassaguerpla Jun 9, 2020
db00ee3
Merge pull request #1140 from dirkmueller/experimental-v5
jordimassaguerpla Jun 9, 2020
4f78ffe
Collect logs from platform after e2e tests (#1142)
pablochacin Jun 9, 2020
b3a5710
versions: Fix Cilium version for k8s v1.18.2 (#1144)
pablochacin Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ release:
.PHONY: go-version-check
go-version-check:
@[ $(GO_VERSION_MAJ) -ge 2 ] || \
[ $(GO_VERSION_MAJ) -eq 1 -a $(GO_VERSION_MIN) -ge 12 ] || (echo "FATAL: Go version should be >= 1.12.x" ; exit 1 ; )
[ $(GO_VERSION_MAJ) -eq 1 -a $(GO_VERSION_MIN) -ge 13 ] || (echo "FATAL: Go version should be >= 1.13.x" ; exit 1 ; )

.PHONY: lint
lint: deps
Expand Down
4 changes: 2 additions & 2 deletions ci/infra/bare-metal/autoyast.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,12 @@ sles ALL=(ALL,ALL) NOPASSWD: ALL" > /etc/sudoers.d/sles
<addons config:type="list">
<addon>
<name>sle-module-containers</name>
<version>15.1</version>
<version>15.2</version>
<arch>x86_64</arch>
</addon>
<addon>
<name>caasp</name>
<version>4.0</version>
<version>5</version>
<arch>x86_64</arch>
<reg_code><!-- replace this comment with a CaaSP registration code --></reg_code>
</addon>
Expand Down
33 changes: 16 additions & 17 deletions ci/infra/libvirt/terraform.tfvars.json.ci.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,24 @@
"workers": 2,
"username": "sles",
"repositories": {
"caasp_devel": "http://download.suse.de/ibs/Devel:/CaaSP:/4.0/SLE_15_SP1/",
"suse_ca": "http://download.suse.de/ibs/SUSE:/CA/SLE_15_SP1/",
"sle_server_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Product-SLES/15-SP1/x86_64/product/",
"basesystem_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Module-Basesystem/15-SP1/x86_64/product/",
"containers_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Module-Containers/15-SP1/x86_64/product/",
"serverapps_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Module-Server-Applications/15-SP1/x86_64/product/",
"sle_server_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Product-SLES/15-SP1/x86_64/update/",
"basesystem_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Module-Basesystem/15-SP1/x86_64/update/",
"containers_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Module-Containers/15-SP1/x86_64/update/",
"serverapps_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Module-Server-Applications/15-SP1/x86_64/update/"
"caasp_devel": "http://download.suse.de/ibs/Devel:/CaaSP:/5/SLE_15_SP2",
"caasp_ga": "http://download.suse.de/ibs/Devel:/CaaSP:/5/SLE_15_SP2/",
"suse_ca": "http://download.suse.de/ibs/SUSE:/CA/SLE_15_SP2",
"sle15sp2_update": "http://download.suse.de/ibs/SUSE:/SLE-15-SP2:/Update/standard/",
"sle15sp2_ga": "http://download.suse.de/ibs/SUSE:/SLE-15-SP2:/GA/standard/",
"sle15sp1_update": "http://download.suse.de/ibs/SUSE:/SLE-15-SP1:/Update/standard/",
"sle15sp1_ga": "http://download.suse.de/ibs/SUSE:/SLE-15-SP1:/GA/standard/",
"sle15_update": "http://download.suse.de/ibs/SUSE:/SLE-15:/Update/standard/",
"sle15_ga": "http://download.suse.de/ibs/SUSE:/SLE-15:/GA/standard/"
},
"lb_repositories": {
"suse_ca": "http://download.suse.de/ibs/SUSE:/CA/SLE_15_SP1/",
"sle_server_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Product-SLES/15-SP1/x86_64/product/",
"basesystem_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Module-Basesystem/15-SP1/x86_64/product/",
"ha_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Product-HA/15-SP1/x86_64/product/",
"ha_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Product-HA/15-SP1/x86_64/update/",
"sle_server_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Product-SLES/15-SP1/x86_64/update/",
"basesystem_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Module-Basesystem/15-SP1/x86_64/update/"
"suse_ca": "http://download.suse.de/ibs/SUSE:/CA/SLE_15_SP2",
"sle15sp2_update": "http://download.suse.de/ibs/SUSE:/SLE-15-SP2:/Update/standard/",
"sle15sp2_ga": "http://download.suse.de/ibs/SUSE:/SLE-15-SP2:/GA/standard/",
"sle15sp1_update": "http://download.suse.de/ibs/SUSE:/SLE-15-SP1:/Update/standard/",
"sle15sp1_ga": "http://download.suse.de/ibs/SUSE:/SLE-15-SP1:/GA/standard/",
"sle15_update": "http://download.suse.de/ibs/SUSE:/SLE-15:/Update/standard/",
"sle15_ga": "http://download.suse.de/ibs/SUSE:/SLE-15:/GA/standard/"
},
"packages": [
"kernel-default",
Expand Down
21 changes: 10 additions & 11 deletions ci/infra/openstack/terraform.tfvars.json.ci.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image_name": "SLES15-SP1-JeOS.x86_64-QU2",
"image_name": "SLES15-SP2-JeOS.x86_64-PublicRC2",
"internal_net": "testing",
"internal_subnet": "testing-subnet",
"internal_router": "testing-router",
Expand All @@ -15,16 +15,15 @@
"workers_vol_enabled": false,
"workers_vol_size": 5,
"repositories": {
"caasp_devel": "http://download.suse.de/ibs/Devel:/CaaSP:/4.0/SLE_15_SP1/",
"suse_ca": "http://download.suse.de/ibs/SUSE:/CA/SLE_15_SP1/",
"sle_server_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Product-SLES/15-SP1/x86_64/product/",
"basesystem_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Module-Basesystem/15-SP1/x86_64/product/",
"containers_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Module-Containers/15-SP1/x86_64/product/",
"serverapps_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Module-Server-Applications/15-SP1/x86_64/product/",
"sle_server_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Product-SLES/15-SP1/x86_64/update/",
"basesystem_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Module-Basesystem/15-SP1/x86_64/update/",
"containers_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Module-Containers/15-SP1/x86_64/update/",
"serverapps_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Module-Server-Applications/15-SP1/x86_64/update/"
"caasp_devel": "http://download.suse.de/ibs/Devel:/CaaSP:/5/SLE_15_SP2",
"caasp_ga": "http://download.suse.de/ibs/Devel:/CaaSP:/5/SLE_15_SP2/",
"suse_ca": "http://download.suse.de/ibs/SUSE:/CA/SLE_15_SP2",
"sle15sp2_update": "http://download.suse.de/ibs/SUSE:/SLE-15-SP2:/Update/standard/",
"sle15sp2_ga": "http://download.suse.de/ibs/SUSE:/SLE-15-SP2:/GA/standard/",
"sle15sp1_update": "http://download.suse.de/ibs/SUSE:/SLE-15-SP1:/Update/standard/",
"sle15sp1_ga": "http://download.suse.de/ibs/SUSE:/SLE-15-SP1:/GA/standard/",
"sle15_update": "http://download.suse.de/ibs/SUSE:/SLE-15:/Update/standard/",
"sle15_ga": "http://download.suse.de/ibs/SUSE:/SLE-15:/GA/standard/"
},
"packages": [
"kernel-default",
Expand Down
34 changes: 17 additions & 17 deletions ci/infra/vmware/terraform.tfvars.json.ci.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@
"vsphere_datastore_cluster": null,
"vsphere_network": "VM Network",
"vsphere_resource_pool": "CaaSP_CI",
"template_name": "SLES15-SP1-GM-up191203-guestinfo",
"template_name": "SLES15-SP2-RC2-up200525-guestinfo",
"firmware": "bios",
"stack_name": "caasp-jenkins-v4",
"masters": 1,
"workers": 2,
"username": "sles",
"lb_repositories": {
"sle_server_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Product-SLES/15-SP1/x86_64/product/",
"basesystem_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Module-Basesystem/15-SP1/x86_64/product/",
"ha_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Product-HA/15-SP1/x86_64/product/",
"ha_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Product-HA/15-SP1/x86_64/update/",
"sle_server_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Product-SLES/15-SP1/x86_64/update/",
"basesystem_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Module-Basesystem/15-SP1/x86_64/update/"
"suse_ca": "http://download.suse.de/ibs/SUSE:/CA/SLE_15_SP2",
"sle15sp2_update": "http://download.suse.de/ibs/SUSE:/SLE-15-SP2:/Update/standard/",
"sle15sp2_ga": "http://download.suse.de/ibs/SUSE:/SLE-15-SP2:/GA/standard/",
"sle15sp1_update": "http://download.suse.de/ibs/SUSE:/SLE-15-SP1:/Update/standard/",
"sle15sp1_ga": "http://download.suse.de/ibs/SUSE:/SLE-15-SP1:/GA/standard/",
"sle15_update": "http://download.suse.de/ibs/SUSE:/SLE-15:/Update/standard/",
"sle15_ga": "http://download.suse.de/ibs/SUSE:/SLE-15:/GA/standard/"
},
"repositories": {
"caasp_devel": "http://download.suse.de/ibs/Devel:/CaaSP:/4.0/SLE_15_SP1/",
"suse_ca": "http://download.suse.de/ibs/SUSE:/CA/SLE_15_SP1/",
"sle_server_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Product-SLES/15-SP1/x86_64/product/",
"basesystem_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Module-Basesystem/15-SP1/x86_64/product/",
"containers_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Module-Containers/15-SP1/x86_64/product/",
"serverapps_pool": "http://download.suse.de/ibs/SUSE/Products/SLE-Module-Server-Applications/15-SP1/x86_64/product/",
"sle_server_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Product-SLES/15-SP1/x86_64/update/",
"basesystem_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Module-Basesystem/15-SP1/x86_64/update/",
"containers_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Module-Containers/15-SP1/x86_64/update/",
"serverapps_updates": "http://download.suse.de/ibs/SUSE/Updates/SLE-Module-Server-Applications/15-SP1/x86_64/update/"
"caasp_devel": "http://download.suse.de/ibs/Devel:/CaaSP:/5/SLE_15_SP2",
"caasp_ga": "http://download.suse.de/ibs/Devel:/CaaSP:/5/SLE_15_SP2/",
"suse_ca": "http://download.suse.de/ibs/SUSE:/CA/SLE_15_SP2",
"sle15sp2_update": "http://download.suse.de/ibs/SUSE:/SLE-15-SP2:/Update/standard/",
"sle15sp2_ga": "http://download.suse.de/ibs/SUSE:/SLE-15-SP2:/GA/standard/",
"sle15sp1_update": "http://download.suse.de/ibs/SUSE:/SLE-15-SP1:/Update/standard/",
"sle15sp1_ga": "http://download.suse.de/ibs/SUSE:/SLE-15-SP1:/GA/standard/",
"sle15_update": "http://download.suse.de/ibs/SUSE:/SLE-15:/Update/standard/",
"sle15_ga": "http://download.suse.de/ibs/SUSE:/SLE-15:/GA/standard/"
},
"packages": [
],
Expand Down
8 changes: 4 additions & 4 deletions ci/jenkins/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
- openstack
- vmware
version:
- v4
- v5:
branch: experimental-v5
- v4:
branch: maintenance-caasp-v4
- v5
jobs:
- '{name}/{version}/{platform}'

Expand All @@ -31,6 +31,7 @@
repo-name: skuba
repo-owner: SUSE
repo-credentials: github-token
branch: maintenance-caasp-v4
platform:
- vmware
test:
Expand Down Expand Up @@ -62,7 +63,6 @@
repo-credentials: github-token
platform:
- vmware
branch: experimental-v5
test:
- test_addon_upgrade
- test_cilium
Expand Down
2 changes: 1 addition & 1 deletion ci/jenkins/pipelines/prs/skuba-test.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ pipeline {
REQUESTS_CA_BUNDLE = '/var/lib/ca-certificates/ca-bundle.pem'
LIBVIRT_URI = 'qemu+ssh://jenkins@kvm-ci.nue.caasp.suse.net/system'
LIBVIRT_KEYFILE = credentials('libvirt-keyfile')
LIBVIRT_IMAGE_URI = 'http://download.suse.de/install/SLE-15-SP1-JeOS-QU2/SLES15-SP1-JeOS.x86_64-15.1-OpenStack-Cloud-QU2.qcow2'
LIBVIRT_IMAGE_URI = 'http://dist.suse.de/install/SLE-15-SP2-JeOS-PublicRC2/SLES15-SP2-JeOS.x86_64-15.2-OpenStack-Cloud-PublicRC2.qcow2'
}

stages {
Expand Down
2 changes: 1 addition & 1 deletion ci/jenkins/pipelines/skuba-e2e-daily.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pipeline {
archiveArtifacts(artifacts: "skuba/ci/infra/${PLATFORM}/terraform.tfstate", allowEmptyArchive: true)
archiveArtifacts(artifacts: "skuba/ci/infra/${PLATFORM}/terraform.tfvars.json", allowEmptyArchive: true)
archiveArtifacts(artifacts: 'testrunner.log', allowEmptyArchive: true)
archiveArtifacts(artifacts: 'skuba/ci/infra/testrunner/*.xml', allowEmptyArchive: true)
sh(script: "make --keep-going -f skuba/ci/Makefile gather_logs", label: 'Gather Logs')
archiveArtifacts(artifacts: 'platform_logs/**/*', allowEmptyArchive: true)
}
cleanup {
Expand Down
2 changes: 1 addition & 1 deletion ci/packaging/suse/skuba_spec_template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Patch0: 0001-Patch-out-load-balancer.patch
BuildRequires: git
BuildRequires: go-go-md2man
BuildRequires: golang-packaging
BuildRequires: golang(API) >= 1.12
BuildRequires: golang(API) = 1.13
BuildRequires: python3-setuptools
# Standard systemd requirements
BuildRequires: pkgconfig(systemd)
Expand Down
58 changes: 30 additions & 28 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,38 @@ require (
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
k8s.io/api v0.17.5
k8s.io/apimachinery v0.17.5
k8s.io/client-go v0.17.5
k8s.io/cluster-bootstrap v0.17.5
k8s.io/api v0.18.2
k8s.io/apimachinery v0.18.2
k8s.io/client-go v0.18.2
k8s.io/cluster-bootstrap v0.18.2
k8s.io/klog v1.0.0
k8s.io/kubectl v0.0.0
k8s.io/kubernetes v1.17.5
sigs.k8s.io/yaml v1.1.0
k8s.io/kubectl v0.18.2
k8s.io/kubernetes v1.18.2
sigs.k8s.io/yaml v1.2.0
)

replace (
k8s.io/api => k8s.io/api v0.17.5
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.5
k8s.io/apimachinery => k8s.io/apimachinery v0.17.5
k8s.io/apiserver => k8s.io/apiserver v0.17.5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.5
k8s.io/client-go => k8s.io/client-go v0.17.5
k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.5
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.5
k8s.io/code-generator => k8s.io/code-generator v0.17.5
k8s.io/component-base => k8s.io/component-base v0.17.5
k8s.io/cri-api => k8s.io/cri-api v0.17.5
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.5
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.5
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.5
k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.5
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.5
k8s.io/kubectl => k8s.io/kubectl v0.17.5
k8s.io/kubelet => k8s.io/kubelet v0.17.5
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.5
k8s.io/metrics => k8s.io/metrics v0.17.5
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.5
k8s.io/api => k8s.io/api v0.18.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.2
k8s.io/apimachinery => k8s.io/apimachinery v0.18.2
k8s.io/apiserver => k8s.io/apiserver v0.18.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.2
k8s.io/client-go => k8s.io/client-go v0.18.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.2
k8s.io/code-generator => k8s.io/code-generator v0.18.2
k8s.io/component-base => k8s.io/component-base v0.18.2
k8s.io/cri-api => k8s.io/cri-api v0.18.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.2
k8s.io/kubectl => k8s.io/kubectl v0.18.2
k8s.io/kubelet => k8s.io/kubelet v0.18.2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.2
k8s.io/metrics => k8s.io/metrics v0.18.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.2
)

go 1.13
Loading