diff --git a/go.mod b/go.mod index b333d71..230152e 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ go 1.17 require ( github.com/coreos/go-oidc/v3 v3.1.0 github.com/gin-gonic/gin v1.8.1 + github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/spf13/cobra v1.3.0 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 - gopkg.in/antage/eventsource.v1 v1.0.0-20150318155416-803f4c5af225 k8s.io/api v0.23.1 k8s.io/apimachinery v0.23.1 k8s.io/client-go v0.23.1 diff --git a/go.sum b/go.sum index acab370..3910ea5 100644 --- a/go.sum +++ b/go.sum @@ -398,6 +398,8 @@ github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= +github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= @@ -868,8 +870,6 @@ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -gopkg.in/antage/eventsource.v1 v1.0.0-20150318155416-803f4c5af225 h1:xy+AV3uSExoRQc2qWXeZdbhFGwBFK/AmGlrBZEjbvuQ= -gopkg.in/antage/eventsource.v1 v1.0.0-20150318155416-803f4c5af225/go.mod h1:SiXNRpUllqhl+GIw2V/BtKI7BUlz+uxov9vBFtXHqh8= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/go/notify/index.html b/go/notify/index.html index 87c298b..40eec83 100644 --- a/go/notify/index.html +++ b/go/notify/index.html @@ -20,6 +20,7 @@
+
\ No newline at end of file diff --git a/go/qrcode/main.go b/go/qrcode/main.go new file mode 100644 index 0000000..7deb7df --- /dev/null +++ b/go/qrcode/main.go @@ -0,0 +1,25 @@ +package main + +import ( + "image/color" + "log" + "os" + + "github.com/skip2/go-qrcode" +) + +func main(){ + code, err := qrcode.New("http://weixin.qq.com/q/02vEhthpJ1fqD1mfbvxzcy", qrcode.High) + if err != nil { + log.Fatal(err) + } + code.BackgroundColor = color.Transparent + data, err := code.PNG(256) + if err != nil { + log.Fatal(err) + } + err = os.WriteFile("tmp.png", data, os.ModePerm) + if err != nil { + log.Fatal(err) + } +} \ No newline at end of file diff --git a/go/qrcode/tmp.png b/go/qrcode/tmp.png new file mode 100755 index 0000000..b73eccc Binary files /dev/null and b/go/qrcode/tmp.png differ diff --git a/kubernetes/installation/containerd.md b/kubernetes/installation/containerd.md index 563e52f..3bcb853 100644 --- a/kubernetes/installation/containerd.md +++ b/kubernetes/installation/containerd.md @@ -92,7 +92,7 @@ cat </etc/cni/net.d/10-my.conf "ipMasq": true, "ipam": { "type": "host-local", - "subnet": "10.0.1.0/16", + "subnet": "172.16.0.0/12", "routes": [ { "dst": "0.0.0.0/0" } ], diff --git a/kubernetes/mantaince/calico.md b/kubernetes/mantaince/calico.md index e69de29..8417977 100644 --- a/kubernetes/mantaince/calico.md +++ b/kubernetes/mantaince/calico.md @@ -0,0 +1,7 @@ +# Calico + +多个网卡时,要添加以下信息来指定bgp绑定的网卡,否则会出现pod不通 +```yaml + - name: IP_AUTODETECTION_METHOD + value: cidr=10.0.0.0/24 +``` \ No newline at end of file