feat

JuckZ · Dec 2, 2022 · 804e320 · 804e320
1 parent 89d2c06
commit 804e320
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 790 deletions.
diff --git a/charts/clash/Chart.yaml b/charts/clash/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.1
+version: 0.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/clash/templates/clash.yaml b/charts/clash/templates/clash.yaml
@@ -17,7 +17,7 @@ spec:
       volumes:
         - name: clash-conf-volume
           hostPath:
-            path: /root/config.yaml
+            path: /root/clash/
       containers:
         - name: clash
           image: dreamacro/clash:v1.12.0
@@ -28,6 +28,8 @@ spec:
           volumeMounts:
             - name: clash-conf-volume
               mountPath: /root/.config/clash
+      nodeSelector:
+        kubernetes.io/hostname: ali-node1
 ---
 apiVersion: v1
 kind: Service

diff --git a/charts/clash/templates/yacd.yaml b/charts/clash/templates/yacd.yaml
@@ -0,0 +1,61 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: yacd
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      # manage pods with the label app: yacd
+      app: yacd
+  template:
+    metadata:
+      labels:
+        app: yacd
+    spec:
+      containers:
+        - name: yacd
+          image: haishanh/yacd
+          ports:
+            - containerPort: 80
+      nodeSelector:
+        kubernetes.io/hostname: ali-node1
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: yacd-svc
+spec:
+  ports:
+    - name: http1
+      port: 80
+  selector:
+    # apply service to any pod with label app: yacd
+    app: yacd
+---
+{{- if .Values.ingress.enabled -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: yacd-ingress
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    cert-manager.io/cluster-issuer: "letsencrypt-prod"
+spec:
+  tls:
+    - hosts:
+        - yacd.ihave.cool
+      secretName: yacd-tls
+  rules:
+    - host: yacd.ihave.cool
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: yacd-svc
+                port:
+                  number: 80
+{{- end }}
diff --git a/headscale/etc/headscale/config.yaml b/headscale/etc/headscale/config.yaml
@@ -123,8 +123,8 @@ tls_letsencrypt_challenge_type: HTTP-01
 tls_letsencrypt_listen: ":http"
 
 ## Use already defined certificates:
-tls_cert_path: ""
-tls_key_path: ""
+tls_cert_path: "/etc/headscale/certs/headscale.ihave.cool.crt"
+tls_key_path: "/etc/headscale/certs/headscale.ihave.cool.key"
 
 log:
   # Output formatting for logs: text or json

diff --git a/k3s/registries.yaml b/k3s/registries.yaml
@@ -1,43 +1,31 @@
 mirrors:
   k8s.gcr.io:
     endpoint:
+      - "https://registry.cn-shenzhen.aliyuncs.com"
       - "https://registry.cn-hangzhou.aliyuncs.com"
     rewrite:
       "(.*)": "icool/$1"
   docker.io:
     endpoint:
-      # - "https://x8pwdtpq.mirror.aliyuncs.com"
-      - "https://registry.cn-hangzhou.aliyuncs.com"
+      - "https://x8pwdtpq.mirror.aliyuncs.com"
     rewrite:
       # "^rancher/(.*)": "mirrorproject/rancher-images/$1"
       "^rancher/mirrored-pause:3.6": "icool/rancher.mirrored-pause:3.6"
       "^k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0": "icool/gcr.csi-node-driver-registrar:v2.3.0"
       "^k8s.gcr.io/sig-storage/csi-resizer:v1.2.0": "icool/gcr.csi-resizer:v1.2.0"
       "^k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3": "icool/gcr.csi-snapshotter:v3.0.3"
-      "^k8s.gcr.io/sig-storage/csi-attacher:v3.1.0": "icool/gcr.csi-snapshotter:v3.0.3"
+      "^k8s.gcr.io/sig-storage/csi-attacher:v3.1.0": "icool/gcr.csi-attacher:v3.1.0"
       "^k8s.gcr.io/sig-storage/snapshot-controller:v3.0.3": "icool/gcr.snapshot-controller:v3.0.3"
       "^k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0": "icool/gcr.csi-provisioner:v3.0.0"
 configs:
-  # "x8pwdtpq.mirror.aliyuncs.com":
-  "*.gcr.io":
-    auth:
-      username: xxx
-      password: xxx
-  "registry.cn-hangzhou.aliyuncs.com":
+  "x8pwdtpq.mirror.aliyuncs.com":
     auth:
-      username: ${ALIYUN_REGISTER_USER}
-      password: ${ALIYUN_REGISTER_PASS}
-
-# docker push "registry.cn-hangzhou.aliyuncs.com/icool/gcr.csi-node-driver-registrar:v2.3.0"
-# docker push "registry.cn-hangzhou.aliyuncs.com/icool/gcr.snapshot-controller:v3.0.3"
-# docker push "registry.cn-hangzhou.aliyuncs.com/icool/gcr.csi-resizer:v1.2.0"
-# docker push "registry.cn-hangzhou.aliyuncs.com/icool/gcr.csi-snapshotter:v3.0.3"
-# docker push "registry.cn-hangzhou.aliyuncs.com/icool/gcr.csi-attacher:v3.1.0"
-# docker push "registry.cn-hangzhou.aliyuncs.com/icool/gcr.csi-provisioner:v3.0.0"
+      username: 18780992520
+      password: zc1998zc
 
-# docker tag "registry.cn-hangzhou.aliyuncs.com/icool/gcr.csi-node-driver-registrar:v2.3.0" "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0"
-# docker tag "registry.cn-hangzhou.aliyuncs.com/icool/gcr.snapshot-controller:v3.0.3" "k8s.gcr.io/sig-storage/snapshot-controller:v3.0.3"
-# docker tag "registry.cn-hangzhou.aliyuncs.com/icool/gcr.csi-resizer:v1.2.0" "k8s.gcr.io/sig-storage/csi-resizer:v1.2.0"
-# docker tag "registry.cn-hangzhou.aliyuncs.com/icool/gcr.csi-snapshotter:v3.0.3" "k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3"
-# docker tag "registry.cn-hangzhou.aliyuncs.com/icool/gcr.csi-attacher:v3.1.0" "k8s.gcr.io/sig-storage/csi-attacher:v3.1.0"
-# docker tag "registry.cn-hangzhou.aliyuncs.com/icool/gcr.csi-provisioner:v3.0.0" "k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0"
+# configs:
+#   # "x8pwdtpq.mirror.aliyuncs.com":
+#   "registry.cn-hangzhou.aliyuncs.com":
+#     auth:
+#       username: ${ALIYUN_REGISTER_USER}
+#       password: ${ALIYUN_REGISTER_PASS}
diff --git a/openebs/install.sh b/openebs/install.sh
@@ -0,0 +1,7 @@
+helm uninstall openebs -n openebs
+
+helm install openebs -n openebs --create-namespace --set cstor.enabled=true --debug .
+
+
+k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
+k8s.gcr.io/sig-storage/csi-node-driver-registrar