From 373b3fad7d71e1e274347adc515488d03af7ed2e Mon Sep 17 00:00:00 2001 From: richard Date: Wed, 17 Sep 2025 21:26:34 -0400 Subject: [PATCH] disable dkregistry --- ansible-5/roles/prod.k3s/defaults/main.yml | 4 +-- .../tasks/deployments/dkregistry.yaml | 2 +- .../templates/dkregistry/deployment.yaml | 28 +++++++++++-------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ansible-5/roles/prod.k3s/defaults/main.yml b/ansible-5/roles/prod.k3s/defaults/main.yml index af5f834..becfb62 100644 --- a/ansible-5/roles/prod.k3s/defaults/main.yml +++ b/ansible-5/roles/prod.k3s/defaults/main.yml @@ -78,8 +78,8 @@ apps: enabled: true namespace: default pvc: data-dkregistry-0 - image: registry:2.8.3 - state: present + image: registry:3 + state: absent nextcloud: enabled: true diff --git a/ansible-5/roles/prod.k3s/tasks/deployments/dkregistry.yaml b/ansible-5/roles/prod.k3s/tasks/deployments/dkregistry.yaml index a6957cd..469e0c7 100644 --- a/ansible-5/roles/prod.k3s/tasks/deployments/dkregistry.yaml +++ b/ansible-5/roles/prod.k3s/tasks/deployments/dkregistry.yaml @@ -36,7 +36,7 @@ name: auth-secret namespace: "{{apps.dkregistry.namespace}}" stringData: - htpassword: "richard:$2y$05$Zp.GEiUbsGYYVOYWE71truuERCAE.D5wwGzU3Xi3wIVAWjH60t/U." + htpasswd: "richard:$2y$05$Zp.GEiUbsGYYVOYWE71truuERCAE.D5wwGzU3Xi3wIVAWjH60t/U." become: true - name: create docker-registry resources diff --git a/ansible-5/roles/prod.k3s/templates/dkregistry/deployment.yaml b/ansible-5/roles/prod.k3s/templates/dkregistry/deployment.yaml index 30922fe..4e7a0ad 100644 --- a/ansible-5/roles/prod.k3s/templates/dkregistry/deployment.yaml +++ b/ansible-5/roles/prod.k3s/templates/dkregistry/deployment.yaml @@ -15,16 +15,21 @@ spec: # - name: certs-vol # mountPath: "/certs" # readOnly: true - - name: auth-vol +# - name: auth-vol +# mountPath: "/auth" +# readOnly: false + - name: auth-secret mountPath: "/auth" readOnly: true - env: - - name: REGISTRY_AUTH - value: "htpasswd" - - name: REGISTRY_AUTH_HTPASSWD_REALM - value: "Registry Realm" - - name: REGISTRY_AUTH_HTPASSWD_PATH - value: "/auth/htpasswd" +# env: +# - name: REGISTRY_AUTH +# value: "htpasswd" +# - name: REGISTRY_AUTH_HTPASSWD_REALM +# value: "Registry Realm" +# - name: REGISTRY_AUTH_HTPASSWD_PATH +# value: "/auth/htpasswd" +# - name: REGISTRY_HTTP_SECRET +# value: "/auth/htpasswd" # - name: REGISTRY_HTTP_TLS_CERTIFICATE # value: "/certs/tls.crt" # - name: REGISTRY_HTTP_TLS_KEY @@ -33,9 +38,10 @@ spec: - name: repo-vol persistentVolumeClaim: claimName: data-dkregistry-0 -# - name: certs-vol -# secret: -# secretName: default/xai-corp-production-tls - name: auth-vol persistentVolumeClaim: claimName: data-dkregistry-auth-0 + + - name: auth-secret + secret: + secretName: auth-secret