image fix

k3s-yamls/registry-ui.yaml

@@ -1,18 +1,17 @@
-# Docker Registry UI - K3s 部署清单
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: docker-registry-ui
-  namespace: default
+  name: registry-ui
+  namespace: registry
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: docker-registry-ui
+      app: registry-ui
   template:
     metadata:
       labels:
-        app: docker-registry-ui
+        app: registry-ui
     spec:
       containers:
       - name: registry-ui
@@ -20,52 +19,23 @@ spec:
         ports:
         - containerPort: 80
         env:
-        - name: REGISTRY_HOST
-          value: "docker-registry"
-        - name: REGISTRY_PORT
-          value: "5000"
-        - name: REGISTRY_PROTOCOL
-          value: "http"
-        - name: DELETE_IMAGES
+        - name: REGISTRY_URL
+          value: "http://registry:5000"
+        - name: REGISTRY_TITLE
+          value: "K3s Private Registry"
+        - name: SINGLE_REGISTRY
           value: "true"
-        resources:
-          limits:
-            cpu: "0.5"
-            memory: "256Mi"
-          requests:
-            cpu: "0.2"
-            memory: "128Mi"
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: docker-registry-ui
-  namespace: default
+  name: registry-ui
+  namespace: registry
 spec:
   type: NodePort
+  selector:
+    app: registry-ui
   ports:
   - port: 80
     targetPort: 80
-    nodePort: 30010
-  selector:
-    app: docker-registry-ui
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: docker-registry-ui-ingress
-  namespace: default
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /
-spec:
-  rules:
-  - host: registry-ui.local
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: docker-registry-ui
-            port:
-              number: 80
+    nodePort: 30501

k3s-yamls/registry.yaml

@@ -1,20 +1,8 @@
-# 私有Docker Registry - K3s 部署清单
-# 等价转换原 docker-compose.yml 所有配置
-apiVersion: v1
-kind: Secret
-metadata:
-  name: registry-auth
-  namespace: default
-type: Opaque
-# 注意：这里仅为占位，实际需要用 htpasswd 生成账号密码后替换
-data:
-  htpasswd: ""
----
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: registry-data
-  namespace: default
+  name: registry-pvc
+  namespace: registry
 spec:
   accessModes:
     - ReadWriteOnce
@@ -25,61 +13,55 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: docker-registry
-  namespace: default
+  name: registry
+  namespace: registry
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: docker-registry
+      app: registry
   template:
     metadata:
       labels:
-        app: docker-registry
+        app: registry
     spec:
       containers:
       - name: registry
         image: registry.cn-hangzhou.aliyuncs.com/zhongpengqun/wanderer:amd64-linux-docker-registry-v2
         ports:
         - containerPort: 5000
-        resources:
-          limits:
-            cpu: "0.5"
-            memory: "256Mi"
-          requests:
-            cpu: "0.2"
-            memory: "128Mi"
         env:
         - name: REGISTRY_AUTH
           value: "htpasswd"
         - name: REGISTRY_AUTH_HTPASSWD_REALM
-          value: "Docker Registry"
+          value: "Registry Realm"
         - name: REGISTRY_AUTH_HTPASSWD_PATH
           value: "/auth/htpasswd"
+        - name: REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY
+          value: "/var/lib/registry"
         volumeMounts:
-        - name: registry-data
-          mountPath: /var/lib/registry
-        - name: registry-auth
+        - name: auth
           mountPath: /auth
-          readOnly: true
+        - name: data
+          mountPath: /var/lib/registry
       volumes:
-      - name: registry-data
-        persistentVolumeClaim:
-          claimName: registry-data
-      - name: registry-auth
+      - name: auth
         secret:
           secretName: registry-auth
+      - name: data
+        persistentVolumeClaim:
+          claimName: registry-pvc
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: docker-registry
-  namespace: default
+  name: registry
+  namespace: registry
 spec:
   type: NodePort
+  selector:
+    app: registry
   ports:
   - port: 5000
-    nodePort: 30009
     targetPort: 5000
-  selector:
-    app: docker-registry
+    nodePort: 30500