Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

k8s #75

Merged
merged 1 commit into from
Oct 23, 2023
Merged

k8s #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions .github/workflows/k8s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:
branches: [ k8s ]

env:
GO111MODULE: on
REPO: easystack/kubernetes
PROJECT: kubernetes
BRANCH: v1.26.5-y
BRANCH: v1.27.6-es
Dockerfile: Dockerfile-k8s

jobs:
Expand All @@ -22,7 +22,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '^1.20'
go-version: '^1.21'

- name: install arm tools
run: |
Expand All @@ -34,9 +34,9 @@ jobs:
- name: Check out build code
uses: actions/checkout@v2
with:
repository: yylt/kubernetes
repository: ${{ env.REPO }}
ref: ${{ env.BRANCH }}
#token: ${{ secrets.KPULL }}
token: ${{ secrets.KPULL }}
path: ${{ env.PROJECT }}

- name: Set up QEMU
Expand All @@ -58,11 +58,11 @@ jobs:
export KUBE_GIT_COMMIT=""
export KUBE_GIT_VERSION=${{ env.BRANCH }}

# export KUBE_BUILD_PLATFORMS=linux/arm64
# make kube-apiserver kubelet kube-proxy kube-controller-manager kube-scheduler kubectl cloud-controller-manager

export KUBE_BUILD_PLATFORMS=linux/amd64
export KUBE_BUILD_PLATFORMS=linux/arm64
make kube-apiserver kubelet kube-proxy kube-controller-manager kube-scheduler kubectl cloud-controller-manager

# export KUBE_BUILD_PLATFORMS=linux/amd64
# make kube-apiserver kubelet kube-proxy kube-controller-manager kube-scheduler kubectl cloud-controller-manager
tree _output

- name: Login to DockerHub
Expand All @@ -76,7 +76,7 @@ jobs:
cd ${{ env.PROJECT }}
docker buildx build \
--cache-from "type=local,src=/tmp/.buildx-cache" \
--platform linux/amd64 \
--platform linux/arm64 \
--output "type=image,push=true" \
--tag yylt/hyperkube:${{ steps.date.outputs.date }} \
--file ../${{ env.Dockerfile }} .
11 changes: 6 additions & 5 deletions Dockerfile-k8s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ ARG TARGETARCH
RUN apk --no-cache add ca-certificates ceph-common \
e2fsprogs xfsprogs ebtables ethtool conntrack-tools \
iptables ipset bash kmod socat util-linux ; \
echo 'hosts: files dns' > /etc/nsswitch.conf; \
rm -rf /sbin/iptables /sbin/iptables-save /sbin/iptables-restore; \
ln -s /sbin/xtables-nft-multi /sbin/iptables; \
ln -s /sbin/xtables-nft-multi /sbin/iptables-save; \
ln -s /sbin/xtables-nft-multi /sbin/iptables-restore
echo 'hosts: files dns' > /etc/nsswitch.conf;
# rm -rf /sbin/iptables /sbin/iptables-save /sbin/iptables-restore; \
# ln -s /sbin/xtables-nft-multi /sbin/iptables; \
# ln -s /sbin/xtables-nft-multi /sbin/iptables-save; \
# ln -s /sbin/xtables-nft-multi /sbin/iptables-restore

ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

COPY ./_output/local/bin/linux/$TARGETARCH/kube* /
#COPY ./_output/local/bin/linux/$TARGETARCH/cloud* /
Expand Down
Loading