Skip to content

Commit edffa8d

Browse files
SignorMercurioSignorMercurio
authored
Merge branch 'master' into master
2 parents 9c5e147 + 0d4d623 commit edffa8d

File tree

30 files changed

+366
-62
lines changed

30 files changed

+366
-62
lines changed

‎module10/loki-stack/readme.MD‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ tar -xvf loki-stack-2.4.1.tgz
2424
cd loki-stack
2525
```
2626

27-
### Replace all `rbac.authorization.k8s.io/v1beta1` with `rbac.authorization.k8s.io/v1` by
28-
29-
```shell
30-
sed -i s#rbac.authorization.k8s.io/v1beta1#rbac.authorization.k8s.io/v1#g *.yaml
27+
### Replace all `rbac.authorization.k8s.io/v1beta1` with `rbac.authorization.k8s.io/v1` by
28+
```sh
29+
grep -rl "rbac.authorization.k8s.io/v1beta1" . | xargs sed -i 's/rbac.authorization.k8s.io\/v1beta1/rbac.authorization.k8s.io\/v1/g'
3130
```
3231

3332
### Install loki locally

‎module10/prometheus/readme.MD‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
```sh
44
shutdown vm
5-
cd VirtualBox\ VMs
5+
cd ~/"VirtualBox VMs"
66
VBoxManage list vms
77
"localkube" {014a8874-1cbe-43ec-a47c-ce7248bce13e}
88
vboxmanage setextradata "localkube" "VBoxInternal/Devices/VMMDev/0/Config/GetHostTimeDisabled" "1"
9+
vboxmanage setextradata "crane" "VBoxInternal/Devices/VMMDev/0/Config/GetHostTimeDisabled" "1"
910
```
1011

1112
### Start VM and then you can get prometheus data

‎module11/operator/kubebuilder.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ Build targets:
6161
deploy: Deploy controller to the K8s cluster specified in ~/.kube/config.
6262
```
6363

64+
### Edit `controllers/mydaemonset_controller.go`, add permissions to the controller
65+
```go
66+
//+kubebuilder:rbac:groups=apps.cncamp.io,resources=mydaemonsets/finalizers,verbs=update
67+
// Add the following
68+
//+kubebuilder:rbac:groups=core,resources=nodes,verbs=get;list;watch
69+
//+kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch;create;update;patch;delete
70+
```
71+
6472
### Generate crd
6573

6674
```sh

‎module12/istio/1.http-gw/simple.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: simple
5+
spec:
6+
replicas: 1
7+
selector:
8+
matchLabels:
9+
app: simple
10+
template:
11+
metadata:
12+
annotations:
13+
prometheus.io/scrape: "true"
14+
prometheus.io/port: "80"
15+
labels:
16+
app: simple
17+
spec:
18+
containers:
19+
- name: simple
20+
imagePullPolicy: Always
21+
image: cncamp/httpserver:v1.0-metrics
22+
ports:
23+
- containerPort: 80
24+
---
25+
apiVersion: v1
26+
kind: Service
27+
metadata:
28+
name: simple
29+
spec:
30+
ports:
31+
- name: http
32+
port: 80
33+
protocol: TCP
34+
targetPort: 80
35+
selector:
36+
app: simple

‎module12/istio/2.l7/istio-specs.yaml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,19 @@ spec:
2727
- destination:
2828
host: nginx.simple.svc.cluster.local
2929
port:
30-
number: 80
30+
number: 80
31+
---
32+
apiVersion: networking.istio.io/v1beta1
33+
kind: Gateway
34+
metadata:
35+
name: simple
36+
spec:
37+
selector:
38+
istio: ingressgateway
39+
servers:
40+
- hosts:
41+
- simple.cncamp.io
42+
port:
43+
name: http-simple
44+
number: 80
45+
protocol: HTTP

‎module12/istio/3.https-gw/cncamp.io.crt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIC1DCCAbwCCQDNrZW+NEze6DANBgkqhkiG9w0BAQsFADAsMRQwEgYDVQQKDAtj
3-
bmNhbXAgSW5jLjEUMBIGA1UEAwwLKi5jbmNhbXAuaW8wHhcNMjExMTI4MDkwMjU2
4-
WhcNMjIxMTI4MDkwMjU2WjAsMRQwEgYDVQQKDAtjbmNhbXAgSW5jLjEUMBIGA1UE
5-
AwwLKi5jbmNhbXAuaW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA
6-
jcjW+NqNF3RRvjkw5+aij1e2F//Ay06rOzDdpsloPJ4vTQIZug+0bflmxYEqKkVC
7-
Mz9+4f/UuYwY6SNa+ajp9/jbO4hMOqsABP7D2IdnXD0E4+eDvYiQddldr51r1UfW
8-
0hsgsfTkwU6nlQKHSPWXiV4RXONpOSsu6RB2Zf9/0MiQzeHpWJ8NB/osDBBMfm2z
9-
BTPb4mCWM5lRxI4E3McEs1uQi1knPpMs3nm0dvD14kzG0nSSETyYFQ7Uch5Da0az
10-
mFWsYigbguxA9ZTgD2CAsP6YT08fiSShMbFHE+vCXnKjBPXtozt/rqu1MSwyZQzb
11-
PkfvZa6gbk1YGvo1pP0zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJbIQOvKQRWK
12-
PKxd9Vj+vqx3PtpwAzTPy1Q0x10DIO4PnGmGJqesgfXiLHA3Np0Ykp1LCB6D4oqF
13-
FGScLc4GmC8RbQHxw8RyPHefrNQr4x2ZMu9kBVmnQfGD8AnkbMp7ltfMakg+rcky
14-
hC6utTMjHjvUMbKAvRzLD1DlGuOT3CjCiW7XhfLNg9qfww4ZSXkTHczOCS/7AXE0
15-
myoLfvgD8rEiQk/klX+VIfT3HcI1xaJ46YugqHushGARVwf3J0gF/CxfUJG50wIV
16-
Zg6bUjY7T5Mh70k3kOlby7LHQPEkm16HvXDc9RWVy+TCChFtY07fj+onlkbyZR8C
17-
LoA815gtTLM=
2+
MIIC1DCCAbwCCQCPNLGdLUqaJzANBgkqhkiG9w0BAQsFADAsMRQwEgYDVQQKDAtj
3+
bmNhbXAgSW5jLjEUMBIGA1UEAwwLKi5jbmNhbXAuaW8wHhcNMjExMjE4MTIzNjQz
4+
WhcNMjIxMjE4MTIzNjQzWjAsMRQwEgYDVQQKDAtjbmNhbXAgSW5jLjEUMBIGA1UE
5+
AwwLKi5jbmNhbXAuaW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDN
6+
KftOzu8h1UbRw2Rj35BI/DClzdDcOHyhTGBZV/fKf6cISyImR/COehjyCl36vBW/
7+
VT4esxcwjCLuUYDOVX6ROqkJPBNWkHv3ExU4BqkzTm2sG2aZ4kgnHMjtcS4F/lnD
8+
NFuuUcwlUOfOcV3KV2z1U1U/0NL4UMyPoBlWkkOq1vNnYn48qeQ1cT6oB722/ill
9+
Ex/ttCT/m6E5sv6ho36MhVsW2OQskQIjhi7bo6cSARHx1SxQI1Bt+kg5i36FrP62
10+
sAaiDg588A+5bBNhtIl7/dg0afAqZmcxLuQHZ2RSQj+lGi4qsvRl71hBdDJwSJ7Z
11+
uPPslBJ1eInzua3xVG3xAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAMVIW9n5htvX
12+
sFpJUFrDIILvzgoVfsaE71V/Qa1SyjgjNUOgr7TH7vZLSdXMAPXhjKlhByYTXuUG
13+
6X/54I8f8PdG+5QUkOH8nUC2KuxAsbNY0yxYHQT8G3YBOnJXGSro2/Nmyoww8Bw3
14+
ETjzlBSxTQez1QzJwqgtv9uUfu92+53cZZ0/mPxnBZJFj8OoA+TAH1nVlELhsA6o
15+
PmZS/3D97JzharoFa2yznfbUHWsYGmUI+xj4UcG+VuaZg8zwvLXJyFQqnlfJ/GhM
16+
oTj4bipm7l6XeR283hLGeuyhXrNkM0lU93PuG+4Z6C9bJ3S7xdQNg4pywgdXszyg
17+
+OHht9cP7b8=
1818
-----END CERTIFICATE-----

‎module12/istio/3.https-gw/cncamp.io.key‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
-----BEGIN PRIVATE KEY-----
2-
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDAjcjW+NqNF3RR
3-
vjkw5+aij1e2F//Ay06rOzDdpsloPJ4vTQIZug+0bflmxYEqKkVCMz9+4f/UuYwY
4-
6SNa+ajp9/jbO4hMOqsABP7D2IdnXD0E4+eDvYiQddldr51r1UfW0hsgsfTkwU6n
5-
lQKHSPWXiV4RXONpOSsu6RB2Zf9/0MiQzeHpWJ8NB/osDBBMfm2zBTPb4mCWM5lR
6-
xI4E3McEs1uQi1knPpMs3nm0dvD14kzG0nSSETyYFQ7Uch5Da0azmFWsYigbguxA
7-
9ZTgD2CAsP6YT08fiSShMbFHE+vCXnKjBPXtozt/rqu1MSwyZQzbPkfvZa6gbk1Y
8-
Gvo1pP0zAgMBAAECggEAE2Ky46GuLyI7Xbdu/pN6TsdrpzOHVhuh0e9lngsan9nq
9-
ewyft4NZ7Wpc/5HGzT3wNxf9voJ2RS5hAmkGXDRiYxvJ/BhkQnhtmtTl6UW1bByH
10-
MCTZvBOq2hBjT+FMUfzo/KGuhX4lD5q+lnSUCpa30wfLZqgZZRCSXmisdZ8TOATa
11-
FfcsxUPvTaXJxkaVD4tai69r9mR6J9fE+ZuR2VEwKk0hslWeJonueimZEnYBfCmF
12-
jRmvAR7Gn/n7Mzg8q6yUbesHyWKFWPt2XnFeV7DYxfcHOrUDXkHcbdMfnphRfnoZ
13-
CifBJZIyH2dMuVf/aZY7pBiZmUSKa383E8ALhvolcQKBgQD3KYjfxunqH8gg3N2p
14-
wmlxYF7EubcpEY+J/fk0rK76WB0zs7idQsLoFKlmUvootbFxZhT1fRhcQRCML68Q
15-
kklD4KoMIRpOsU75/SU1cEAO6g7oKNfBXymVNrVBjjnKAd1/BO2bvkhzr6JB1Iak
16-
OQRORaNmArBxwVxdUpFMFvGkvwKBgQDHcGCa6Q8o9DDlBjleJ1wQJeBqGMMijczs
17-
RtBp/m8UoOV2Vg9R9qNcGEgx4AKQwsBZX/5xZKzWxBlC41QrGwHhg7kQzYnbm16S
18-
0kvhX9sYhX3NbL3bEZJwT5OVIscJ+cmuT8NDAkuBXjuWyFl8+J2cvQQedQtilUmN
19-
0jN+0oLAjQKBgAlkAJlP+28zyezFt35NrqfqG2+qBrV+v09k4OUJcpR8aI+gUnFX
20-
KgSbVFxY5rxJOvauBDnXiOdoaXKKFUKx7CqyDIPtdgxrXC7PWWyQWT630d0sQBZO
21-
wUu0Cmr1NmjgbUP4Mfbq4eHTWHzb0EnJCMrYhn7Ht2B7EkFRc8fKT2ANAoGBAKlQ
22-
mFMrRPmJxfDJRe7PD3OOFGU+PHubUrvMqqcxoHAs4GGEUmFNOAa5fqEJAmSPUekO
23-
e98cjzeNJ70Hba9isEgaIgVH2Z+c2b9f1ZeyXzkEK3c4uD3BP0cl568W5U9sxnG7
24-
uZOr4RolPAWYdZCJKJWmSlbpGw9ImjdSmvEyGlsJAoGAdL1jorqfohKRFlc5L9Hz
25-
4rKX58OiJbCuEYSL4v7W7SFlYCU1+wiv45y9YnLBVqUQKzIlfd28YhlW37NiehbX
26-
rN9il/5Dt9RUZDyc5wgYH/xDHO1z2anTomNUAVrGzB89z6dfyQrDBybR2tAvspdH
27-
frS5y+yhaUCMKFPSjpP6MZE=
2+
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDNKftOzu8h1UbR
3+
w2Rj35BI/DClzdDcOHyhTGBZV/fKf6cISyImR/COehjyCl36vBW/VT4esxcwjCLu
4+
UYDOVX6ROqkJPBNWkHv3ExU4BqkzTm2sG2aZ4kgnHMjtcS4F/lnDNFuuUcwlUOfO
5+
cV3KV2z1U1U/0NL4UMyPoBlWkkOq1vNnYn48qeQ1cT6oB722/illEx/ttCT/m6E5
6+
sv6ho36MhVsW2OQskQIjhi7bo6cSARHx1SxQI1Bt+kg5i36FrP62sAaiDg588A+5
7+
bBNhtIl7/dg0afAqZmcxLuQHZ2RSQj+lGi4qsvRl71hBdDJwSJ7ZuPPslBJ1eInz
8+
ua3xVG3xAgMBAAECggEBAK4zPTzXG9hgXPdyrmTWyI4QA8ZkkTjLhZb3YL+7n5wC
9+
83JpSR+z6Z8wMMoi31UsKlMBL/OlIMWJ14b/ER0hHox1gF1k8w6HM5rASz38+eGk
10+
cB64TU/QAG+lUz244dkY9GJ4rHfA4FO29HwnafmKbeuHzFSZHOjWwjoZOCp3mpkM
11+
z1N0pun5nKUEUy19E4LjE3QU7AFNx8oFlkE9k0pL6t6VZolVhJBPpxGapwj5K0Uu
12+
HZjJjSrZok8qCFJfMauOA6avIIAdxvFrZpHVJflMg0Nu+pEVsYfVzPjOzSMmdHgf
13+
eVSvDf+nxAvb09Oa10iKH/UCGjzTVfH6UjdAyoskxDkCgYEA+44hxd/P/Wo2mGiT
14+
ilELJEOfVHlZIBrGvrrOHPZc1LB0hLxTK9VzN7VYRu+ZSdS5V5ahPkfa4/fgNBfz
15+
zXoioA6Li3bcRCOFlDyAqhBaEXk+YWHH0poeqmSnV6XlRqDOKCSjsHojYfasBGju
16+
g1N2Gh7JusY5ttLjufv7Bt2BRpcCgYEA0MoBvyZxcIMIjuMoRPQ2eJ3W1Yms4CVa
17+
HT/lPOguZSKI/1vywK1doVnrgikUQRLNSVFMGeHwRcbNbWNyTGafc/Q2hNVR8XBc
18+
mRwNcmWqwRqYiN2eOtWOyxN9IhA1vXUAxyYIkDCOq/NmQYwtoqhB4Esmp1ZDv1vh
19+
IkqO+VEDyLcCgYB3u+1DXAaJ3nZiENS5L14YQr+h26iaaWRUAGJ+0pzY96xeSa1k
20+
3dJbn8uG6CCUTdZyZFYXaOg9PgzPft8i3JGCkanGFis9m5LHPg0X5XSZgJY6j+om
21+
ygjynboxM9tvxLab0OTA6UHSLTEvYCq3A5DhWeo3JobuCG8wZUnUuLYBvQKBgGhG
22+
a2bnMUKq/qw2QRdnDIli8zfEwcVUglQXZErt/rXd8KPwbSXTr+50tU1VbNsvI73Z
23+
T3Ohxtlid5iJUT1dB4fm0Q+4Zmt53ZVOUFzw773vpXy9ilgB7oX33sgTZnOPqurL
24+
UP2KcsboEgrskqIo/HWjstNiHwXEQoVYzV0xG/2zAoGAI50SRG1Gxv0HqVJJ+DHR
25+
OI0gBiGVNqo31f+IvQSB4xhX0wzBjV56ov4eNByq/eWVbkOA5kjo3zUyZ9zu9ZFi
26+
A8VTczIQyd1vmTzApsbxI5UVRzwc49vSzQWi7NcoO7YlSrzr6hU/zqtWTnNAyupz
27+
lyKjB5MXvtypRS46hxPCRXU=
2828
-----END PRIVATE KEY-----

‎module12/istio/tracing/readme.MD‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ set tracing.sampling=100
77
```
88

99
### Deploy tracing
10-
1110
```sh
12-
kubectl apply ns tracing
11+
kubectl create ns tracing
1312
kubectl label ns tracing istio-injection=enabled
1413
kubectl -n tracing apply -f service0.yaml
1514
kubectl -n tracing apply -f service1.yaml

‎module13/federation/readme.MD‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
## install kubefed by kind
12
### 下载federation代码
23
```
34
git clone https://github.com/kubernetes-sigs/kubefed.git
@@ -18,14 +19,18 @@ current-context: `cluster1`
1819
```
1920
kind create cluster
2021
make deploy.kind
21-
kubectl -n kube-federation-system get kubefedcluster
22+
kubectl -n kube-federation-system get kubefedcluster -oyaml
2223
```
2324
### fix
2425
```
25-
k get po -n kube-system kube-apiserver-kind-control-plane
26+
k get po -n kube-system kube-apiserver-kind-control-plane -owide
2627
kube-system kube-apiserver-kind-control-plane 1/1 Running 0 24m 172.18.0.2 kind-control-plane <none> <none>
2728
172.18.0.2
2829
```
30+
#### edit kubefedcluster and change apiEndpoint to 172.18.0.2:6443
31+
```
32+
kubectl -n kube-federation-system edit kubefedcluster
33+
```
2934
### 安装完成后查看federation
3035
```
3136
kubectl get all -n kube-federation-system

‎module14/networkpolicy/readme.MD‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ kubectl get po -n calico-demo -owide
1313
### start clientpod
1414
```
1515
kubectl apply -f toolbox.yaml
16+
kubectl apply -f toolbox.yaml -n calico-demo
1617
```
1718
### enter toolbox shell
1819
```
@@ -27,7 +28,16 @@ ping <calico-pod-ip>
2728
```
2829
kubectl create -f allow-icmp-incluster.yaml
2930
```
30-
### test connectivity
31+
### test connectivity from two toolbox pod
32+
```
33+
curl <calico-pod-ip>
34+
ping <calico-pod-ip>
35+
```
36+
### create networkpolicy to allow access
37+
```
38+
kubectl create -f access-calico-demo.yaml
39+
```
40+
### test connectivity from two toolbox pod
3141
```
3242
curl <calico-pod-ip>
3343
ping <calico-pod-ip>

0 commit comments

Comments
 (0)