Merge pull request #7689 from justinsb/upgrade_pod2daemon_only

Calico: upgrade pod2daemon (only)
kubernetes · Sep 27, 2019 · ac36e9c · ac36e9c
2 parents 4de90d2 + 70dd5c3
commit ac36e9c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template
@@ -747,7 +747,8 @@ spec:
         # Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
         # to communicate with Felix over the Policy Sync API.
         - name: flexvol-driver
-          image: calico/pod2daemon-flexvol:v3.8.2
+          # We bump this to v3.9.1 to pick up https://github.com/projectcalico/pod2daemon/pull/28
+          image: calico/pod2daemon-flexvol:v3.9.1
           volumeMounts:
           - name: flexvol-driver-host
             mountPath: /host/driver

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -826,7 +826,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 			"k8s-1.6":     "2.6.9-kops.1",
 			"k8s-1.7":     "2.6.12-kops.1",
 			"k8s-1.7-v3":  "3.8.0-kops.1",
-			"k8s-1.12":    "3.8.2-kops.2",
+			"k8s-1.12":    "3.8.2-kops.3",
 		}
 
 		{