From 1747114df23602e6c14e160c0e19304e4599a62c Mon Sep 17 00:00:00 2001
From: ace <ace@0xace.cc>
Date: Tue, 15 Jun 2021 03:30:01 +0300
Subject: [PATCH] fix pypiserver role

---
 roles/pypiserver/defaults/main.yaml | 17 +----------------
 roles/pypiserver/tasks/main.yaml    |  2 +-
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/roles/pypiserver/defaults/main.yaml b/roles/pypiserver/defaults/main.yaml
index f35af5c..e7d80e3 100644
--- a/roles/pypiserver/defaults/main.yaml
+++ b/roles/pypiserver/defaults/main.yaml
@@ -4,16 +4,6 @@ pypiserver_short_name: "pip"
 pypiserver_default_values:
   ## If you want more than 1 replica you will have to use a ReadWriteMany volume
   replicaCount: 1
-  image:
-    repository: pypiserver/pypiserver
-    tag: v1.3.2
-    pullPolicy: IfNotPresent
-    pullSecrets: []
-  pypiserver:
-    # for a list of options see: https://github.com/pypiserver/pypiserver
-    extraArgs: []
-      # - --disable-fallback
-      # - --log-conf=/path/to/file
   auth:
     ## comma-separated list of (case-insensitive) actions to authenticate
     ## Use '.' or '' for empty. Requires to have set the password (option below).
@@ -27,7 +17,7 @@ pypiserver_default_values:
     enabled: true
     labels: {}
     annotations: 
-      kubernetes.io/ingress.class: "{{ external_ingress_class if registry_publish else internal_ingress_class }}"
+      kubernetes.io/ingress.class: "{{ external_ingress_class if pypiserver_publish else internal_ingress_class }}"
       cert-manager.io/cluster-issuer: "letsencrypt-prod"
       nginx.ingress.kubernetes.io/proxy-body-size: "0"
       nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
@@ -45,8 +35,3 @@ pypiserver_default_values:
     size: "{{ pypiserver_size | default('20Gi') }}"
     accessMode: "{{ pypiserver_storage_mode | default('ReadWriteMany') }}"
     mountPropagation: None
-  securityContext:
-    enabled: true
-    runAsUser: 0
-    runAsGroup: 0
-    fsGroup: 1000
diff --git a/roles/pypiserver/tasks/main.yaml b/roles/pypiserver/tasks/main.yaml
index 03c396d..e3a5952 100644
--- a/roles/pypiserver/tasks/main.yaml
+++ b/roles/pypiserver/tasks/main.yaml
@@ -6,7 +6,7 @@
     create_namespace: true
     release_namespace: "{{ pypiserver_namespace | default(namespace) }}"
     release_name: "{{ pypiserver_name | default('pypiserver') }}"
-    chart_ref: "{{ pypiserver_chart | default('owkin/pypiserver') }}"
+    chart_ref: "{{ pypiserver_chart | default('ghp/pypiserver') }}"
     chart_version: "{{ pypiserver_version | default(omit) }}"
     release_values: "{{ pypiserver_combined_values | from_yaml }}"
     wait: true