8000 Testing kicbase REGISTRY_{USER,PASSWORD} by nirs · Pull Request #11 · nirs/minikube · GitHub
[go: up one dir, main page]

Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 10 additions & 5 deletions .github/workflows/kicbase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ on:
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.27.3'
PLATFORMS: "linux/amd64,linux/arm64,linux/s390x,linux/ppc64le"
# Configurable via GitHub Repo Settings -> Variables (vars.KICBASE_REPO & vars.KICBASE_REGISTRY)
# linux/s390x is omitted until vim-tiny is installable on s390x again.
# Revert this when https://bugs.debian.org/1152930 is fixed and uploaded.
PLATFORMS: "linux/amd64,linux/arm64,linux/ppc64le"
# Configurable via GitHub Repo Settings -> Variables (vars.KICBASE_REPO & vars.KICBASE_REGISTRY).
# Login uses secrets.REGISTRY_USER / secrets.REGISTRY_PASSWORD, shared with the toolchain and ISO builds.
KICBASE_REPO: ${{ inputs.repo || vars.KICBASE_REPO || 'docker.io/kicbase/build' }}
KICBASE_REGISTRY: ${{ vars.KICBASE_REGISTRY || 'docker.io' }}
# Commit status reported on the PR head, like a prow job context.
Expand Down Expand Up @@ -163,8 +166,8 @@ jobs:
uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0
with:
registry: ${{ env.KICBASE_REGISTRY }}
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.REGISTRY_PASSWORD }}

- name: Build and push kicbase image
id: build
Expand Down Expand Up @@ -210,8 +213,10 @@ jobs:

update-pr:
needs: build-kicbase
# contents: write lets GITHUB_TOKEN push to a branch in this repo when
# MINIKUBE_BOT_PAT is unset. The push step still prefers the bot PAT.
permissions:
contents: read
contents: write
statuses: write
pull-requests: write
runs-on: ubuntu-22.04
Expand Down
2 changes: 2 additions & 0 deletions deploy/kicbase/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ ARG KICBASE_IMAGE="debian:trixie-20261027-slim"
# for a kubernetes node image, it doesn't contain much we don't need.< 10BC8 /td>
FROM ${KICBASE_IMAGE} AS kicbase

# Testing registry creds

ARG BUILDKIT_VERSION="v0.33.0"
ARG CRIO_VERSION="v1.35"
ARG CRICTL_VERSION="v1.35.0"
Expand Down
10 changes: 5 additions & 5 deletions hack/kicbase_version/os-package-list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ii conntrack 1:1.4.8-2 amd64
ii containerd.io 2.4.2-3~debian.13~trixie amd64 An open and reliable container runtime
ii containernetworking-plugins 1.1.1+ds1-3+b17 amd64 standard networking plugins - binaries
ii coreutils 9.7-3 amd64 GNU core utilities
ii cri-o 1.35.10-1.1 amd64 Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
ii cri-o 1.35.11-1.1 amd64 Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
ii crun 1.21-1 amd64 lightweight OCI runtime for running containers
ii curl 8.14.1-2+deb13u7 amd64 command line tool for transferring data with URL syntax
ii dash 0.5.12-12 amd64 POSIX-compliant shell
Expand All @@ -35,8 +35,8 @@ ii diffutils 1:3.10-4 amd64
ii dirmngr 2.4.7-21+deb13u1+b5 amd64 GNU privacy guard - network certificate management service
ii dmsetup 2:1.02.205-2 amd64 Linux Kernel Device Mapper userspace library
ii docker-buildx-plugin 0.38.1-1~debian.13~trixie amd64 Docker Buildx plugin extends build capabilities with BuildKit.
ii docker-ce 5:29.9.2-1~debian.13~trixie amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:29.9.2-1~debian.13~trixie amd64 Docker CLI: the open-source application container engine
ii docker-ce 5:29.9.3-1~debian.13~trixie amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:29.9.3-1~debian.13~trixie amd64 Docker CLI: the open-source application container engine
ii dpkg 1.22.22 amd64 Debian package management system
ii ebtables 2.0.11-6 amd64 Ethernet bridge frame table administration
ii ethtool 1:6.14.2-1 amd64 display or change Ethernet device settings
Expand Down Expand Up @@ -226,6 +226,6 @@ ii tzdata 2026e-0+deb13u1 all
ii ucf 3.0052 all Update Configuration File(s): preserve user changes to config files
ii udev 257.13-1~deb13u1 amd64 /dev/ and hotplug management daemon
ii util-linux 2.41.5-0+deb13u1 amd64 miscellaneous system utilities
ii vim-common 2:9.1.1230-2 all Vi IMproved - Common files
ii vim-tiny 2:9.1.1230-2 amd64 Vi IMproved - enhanced vi editor - compact version
ii vim-common 2:9.1.1230-2+deb13u1 all Vi IMproved - Common files
ii vim-tiny 2:9.1.1230-2+deb13u1 amd64 Vi IMproved - enhanced vi editor - compact version
ii zlib1g:amd64 1:1.3.dfsg+really1.3.1-1+b1 amd64 compression library - runtime
8 changes: 4 additions & 4 deletions pkg/drivers/kic/types.go
C332
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ import (

const (
// Version is the current version of kic
Version = "v0.0.51-1793434482-23965"
Version = "v0.0.51-1794060884-11"

// SHA of the kic base image
baseImageSHA = "83025626777aa55e329279b88088000832cd916b112af92b1d427529164fa7f5"
baseImageSHA = "4d73c19495cf3c81ae66d0617fe187fe5fbd116a1a8a7654c36c8c51dac61614"
// The name of the GCR kicbase repository
gcrRepo = "docker.io/kicbase/build"
gcrRepo = "quay.io/nirsof/kicbase"
// The name of the Dockerhub kicbase repository
dockerhubRepo = "docker.io/kicbase/build"
dockerhubRepo = "quay.io/nirsof/kicbase"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/commands/start.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ minikube start [flags]
--apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine
--apiserver-port int The apiserver listening port (default 8443)
--auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s)
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "docker.io/kicbase/build:v0.0.51-1793434482-23965@sha256:83025626777aa55e329279b88088000832cd916b112af92b1d427529164fa7f5")
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "quay.io/nirsof/kicbase:v0.0.51-1794060884-11@sha256:4d73c19495cf3c81ae66d0617fe187fe5fbd116a1a8a7654c36c8c51dac61614")
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)
Expand Down
0