Skip to content

Commit 0439026

Browse files
author
Klaus Ma
committed
Update repo info.
1 parent a6bcd36 commit 0439026

File tree

8 files changed

+33
-17
lines changed

8 files changed

+33
-17
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ bin/
33
sbin/
44
env/
55
data/
6-
.idea/
6+
.idea/
7+
build/

Makefile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
BCE_VER=v0.1.0
12
K8S_VER=v1.24.1
23
ETCD_VER=3.5.3-0
34
DNS_VER=v1.8.6
45
PAUSE_VER=3.7
56

7+
REL_PKGS="invetory sbin playbook bce.yaml bce-installer"
8+
REL_NAME=${BCE_VER}-linux-`uname -m`
9+
610
docker-build: kube-apiserver kube-scheduler kube-controller-manager kube-proxy pause etcd coredns
711

812
kube-apiserver:
@@ -31,3 +35,14 @@ coredns:
3135

3236
pause:
3337
docker build sbin -t openbce/pause:${PAUSE_VER} -f docker/Dockerfile.pause
38+
39+
release:
40+
mkdir -p build/bce-${BCE_VER}
41+
for number in ${REL_PKGS} ; do \
42+
cp -R $$number build/bce-${BCE_VER}/ ; \
43+
done
44+
tar cvf build/bce-${REL_NAME}.tar -C build bce-${BCE_VER}
45+
gzip build/bce-${REL_NAME}.tar
46+
47+
clean:
48+
rm -rf build

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,16 @@
1515
### Execute installer command on bootstrap nodes
1616

1717
```
18-
sudo cbe-installer
18+
sudo bce-installer
1919
```
2020

2121
## Configurations
2222

2323
```
24-
xflops-version: 1.0
24+
bce-version: 1.0
2525
kubernetes-version: 1.24.1
2626
work_dir: /scrap/users/klausm
2727
image-repository: docker.io/openbce
2828
pod-network-cidr: 172.88.0.0/16
29-
apiserver-advertise-address: 10.210.0.125
3029
service-cidr: 172.96.0.0/12
3130
```

bce-installer

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#!/bin/bash
22

3+
if [ `id -u` -ne 0 ];then
4+
echo "bce-installer requires root permission"
5+
exit 1
6+
fi
7+
38
for i in "prepare" "master" "worker"
49
do
510
ansible-playbook -i invetory/hosts playbook/${i}.yaml
@@ -9,7 +14,3 @@ do
914
fi
1015
done
1116

12-
#
13-
#ansible-playbook -i invetory/hosts playbook/prepare.yaml
14-
#ansible-playbook -i invetory/hosts playbook/master.yaml
15-
#ansible-playbook -i invetory/hosts playbook/worker.yaml

bce.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
xflops_version: 1.0
1+
bce_version: 0.1
22
k8s_version: 1.24.1
33
work_dir: /scrap/users/klausm
44
image_repository: docker.io/openbce

playbook/master.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: Install XFLOPS master
2+
- name: Install openBCE master
33
hosts: masters
44
vars_files:
55
- ../bce.yaml

playbook/prepare.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: Prepare environment for XFLOPS
2+
- name: Prepare environment for openBCE
33
hosts: all
44
vars_files:
55
- ../bce.yaml
@@ -10,22 +10,22 @@
1010
tasks:
1111
- name: Make working directory
1212
file: path={{work_dir}} state=directory mode=0755
13-
# Deploy XFLOPS binaries
13+
# Deploy openBCE binaries
1414
- name: Deploy binaries
1515
copy: src=../sbin/{{ item }} dest=/usr/bin/{{ item }} owner=root group=root mode=0755
1616
with_items: "{{ sbin_items }}"
1717

1818
# Set up network
1919
- name: Install Network dependencies
2020
package: name="{{ dep_items }}" state=present
21-
- name: Copy XFLOPS modules
21+
- name: Copy openBCE modules
2222
copy: src=templates/bce.modules dest=/etc/modules-load.d/bce.conf owner=root group=root mode=0644
23-
- name: Copy XFLOPS sysctl
23+
- name: Copy openBCE sysctl
2424
copy: src=templates/bce.sysctl dest=/etc/sysctl.d/bce.conf owner=root group=root mode=0644
25-
- name: Enable XFLOPS modules
25+
- name: Enable openBCE modules
2626
shell: modprobe {{ item }}
2727
with_items: "{{ mod_items }}"
28-
- name: Enable XFLOPS sysctl
28+
- name: Enable openBCE sysctl
2929
shell: sysctl --system
3030

3131
# Setup containerd

playbook/worker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: Install XFLOPS workers
2+
- name: Install openBCE workers
33
hosts: workers
44
vars_files:
55
- ../bce.yaml

0 commit comments

Comments
 (0)