Merge pull request #414 from simonswine/update-k8s-versiosn

Update k8s versions used in tests
jetstack · Aug 7, 2018 · 93fc4a7 · 93fc4a7
2 parents a0db84f + 9f6be32
commit 93fc4a7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/pkg/apis/cluster/v1alpha1/defaults.go b/pkg/apis/cluster/v1alpha1/defaults.go
@@ -38,7 +38,7 @@ func SetDefaults_Cluster(obj *Cluster) {
 
 	// set default kubernetes version
 	if obj.Kubernetes.Version == "" {
-		obj.Kubernetes.Version = "1.9.7"
+		obj.Kubernetes.Version = "1.9.10"
 	}
 
 	// zone

diff --git a/puppet/modules/tarmak/Makefile b/puppet/modules/tarmak/Makefile
@@ -1,8 +1,8 @@
 BUNDLE_DIR ?= .bundle
 
-VERSION_1_11 := 1.11.0
-VERSION_1_10 := 1.10.5
-VERSION_1_9 := 1.9.9
+VERSION_1_11 := 1.11.1
+VERSION_1_10 := 1.10.6
+VERSION_1_9 := 1.9.10
 VERSION_1_8 := 1.8.15
 VERSION_1_7 := 1.7.16
 VERSION_1_6 := 1.6.13

diff --git a/puppet/modules/tarmak/manifests/master.pp b/puppet/modules/tarmak/manifests/master.pp
@@ -165,12 +165,12 @@
       cert_file => "${admin_base_path}.pem",
   }
 
-  Service['kube-scheduler-cert.service'] -> Service['kube-scheduler.service']
-  Service['kube-controller-manager-cert.service'] -> Service['kube-controller-manager.service']
-  Service['kube-apiserver-cert.service'] -> Service['kube-apiserver.service']
-  Service['kube-admin-cert.service'] -> Service['kube-apiserver.service']
-  Service['kube-service-account-key-secret.service'] -> Service['kube-controller-manager.service']
-  Service['kube-service-account-key-secret.service'] -> Service['kube-apiserver.service']
+  Vault_Client::Cert_Service['kube-scheduler'] -> Service['kube-scheduler.service']
+  Vault_Client::Cert_Service['kube-controller-manager'] -> Service['kube-controller-manager.service']
+  Vault_Client::Cert_Service['kube-apiserver'] -> Service['kube-apiserver.service']
+  Vault_Client::Cert_Service['kube-admin'] -> Service['kube-apiserver.service']
+  Vault_Client::Secret_Service['kube-service-account-key'] -> Service['kube-controller-manager.service']
+  Vault_Client::Secret_Service['kube-service-account-key'] -> Service['kube-apiserver.service']
   Service['kube-admin-cert.service'] -> Kubernetes::Apply <||>
 
   class { 'kubernetes::master':

diff --git a/puppet/modules/tarmak/spec/acceptance/single_node_spec.rb b/puppet/modules/tarmak/spec/acceptance/single_node_spec.rb
@@ -156,6 +156,11 @@
         end
       end
 
+      it 'should have a service account ready', :retry => 20, :retry_wait => 1 do
+        result = shell('kubectl get serviceaccount --namespace developer default')
+        expect(result.exit_code).to eq(0)
+      end
+
       it 'allows developer to run unprivileged pods in namespace developer' do
         result = shell('kubectl --as=developer run busybox --image=busybox --restart=Never -n developer --rm --attach  -- uname -a')
         expect(result.exit_code).to eq(0)