Skip to content

Commit

Permalink
Merge pull request #3521 from BenTheElder/bump-base5
Browse files Browse the repository at this point in the history
bump base image
  • Loading branch information
BenTheElder authored Feb 14, 2024
2 parents 749005b + 455f9e7 commit f7e5c8e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pkg/apis/config/defaults/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ limitations under the License.
package defaults

// Image is the default for the Config.Image field, aka the default node image.
const Image = "kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144"
const Image = "kindest/node:v1.29.1@sha256:0c06baa545c3bb3fbd4828eb49b8b805f6788e18ce67bff34706ffa91866558b"
7 changes: 0 additions & 7 deletions pkg/build/nodeimage/buildcontext.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,6 @@ func (c *buildContext) buildImage(bits kube.Bits) error {

c.logger.V(0).Info("Building in container: " + containerID)

// make artifacts directory
// TODO: remove this after the next release, we pre-create this in the base image now
if err = cmder.Command("mkdir", "-p", "/kind/").Run(); err != nil {
c.logger.Errorf("Image build Failed! Failed to make directory %v", err)
return err
}

// copy artifacts in
for _, binary := range bits.BinaryPaths() {
// TODO: probably should be /usr/local/bin, but the existing kubelet
Expand Down
2 changes: 1 addition & 1 deletion pkg/build/nodeimage/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ const DefaultImage = "kindest/node:latest"
// DefaultBaseImage is the default base image used
// TODO: come up with a reasonable solution to digest pinning
// https://github.com/moby/moby/issues/43188
const DefaultBaseImage = "docker.io/kindest/base:v20240202-8f1494ea"
const DefaultBaseImage = "docker.io/kindest/base:v20240212-c4cadcab"

0 comments on commit f7e5c8e

Please sign in to comment.