Merge pull request #10823 from hakman/automated-cherry-pick-of-#10820…

…-upstream-release-1.20 Automated cherry pick of #10820: feat(spot/addon): bump ocean-controller to 1.0.72
kubernetes · Feb 14, 2021 · 4a91a5e · 4a91a5e
2 parents 68e3062 + 8ca5dfc
commit 4a91a5e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/upup/models/bindata.go b/upup/models/bindata.go
diff --git a/...sources/addons/spotinst-kubernetes-cluster-controller.addons.k8s.io/v1.14.0.yaml.template b/...sources/addons/spotinst-kubernetes-cluster-controller.addons.k8s.io/v1.14.0.yaml.template
@@ -125,12 +125,18 @@ rules:
 - apiGroups: [""]
   resources: ["pods"]
   verbs: ["get", "list", "patch", "update", "create", "delete"]
+- apiGroups: ["batch"]
+  resources: ["jobs"]
+  verbs: ["get", "list", "patch","update","create","delete"]
   # ----------------------------------------------------------------------------
   # Required by Spotinst Wave.
   # ----------------------------------------------------------------------------
 - apiGroups: ["sparkoperator.k8s.io"]
   resources: ["sparkapplications", "scheduledsparkapplications"]
   verbs: ["get", "list"]
+- apiGroups: ["wave.spot.io"]
+  resources: ["sparkapplications", "wavecomponents", "waveenvironments"]
+  verbs: ["get", "list"]
 ---
 # ------------------------------------------------------------------------------
 # Cluster Role Binding
@@ -199,7 +205,7 @@ spec:
       containers:
       - name: spotinst-kubernetes-cluster-controller
         imagePullPolicy: Always
-        image: spotinst/kubernetes-cluster-controller:1.0.70
+        image: spotinst/kubernetes-cluster-controller:1.0.72
         livenessProbe:
           httpGet:
             path: /healthcheck

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
@@ -667,7 +667,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
 		{
 			id := "v1.14.0"
 			location := key + "/" + id + ".yaml"
-			version := "1.0.70"
+			version := "1.0.72"
 
 			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
 				Name:              fi.String(key),