diff --git a/helm/templates/static-deployment.yaml b/helm/templates/static-deployment.yaml index dc8a4bb0e..710bd082f 100644 --- a/helm/templates/static-deployment.yaml +++ b/helm/templates/static-deployment.yaml @@ -25,19 +25,19 @@ spec: imagePullPolicy: IfNotPresent ports: - name: http - containerPort: 8080 + containerPort: 80 protocol: TCP livenessProbe: initialDelaySeconds: 10 timeoutSeconds: 5 httpGet: - path: /-/ping + path: / port: http readinessProbe: initialDelaySeconds: 10 timeoutSeconds: 5 httpGet: - path: /-/ping + path: / port: http resources: requests: diff --git a/helm/templates/static-service.yaml b/helm/templates/static-service.yaml index 4050906ab..c8b717429 100644 --- a/helm/templates/static-service.yaml +++ b/helm/templates/static-service.yaml @@ -11,7 +11,7 @@ metadata: spec: type: ClusterIP ports: - - port: 8080 + - port: 80 targetPort: http protocol: TCP name: http diff --git a/passbook/admin/views/policy.py b/passbook/admin/views/policy.py index 71ecb223f..6282447cb 100644 --- a/passbook/admin/views/policy.py +++ b/passbook/admin/views/policy.py @@ -24,7 +24,7 @@ class PolicyListView(LoginRequiredMixin, PermissionListMixin, ListView): model = Policy permission_required = "passbook_core.view_policy" - + ordering = "order" template_name = "administration/policy/list.html" def get_context_data(self, **kwargs): @@ -34,7 +34,7 @@ class PolicyListView(LoginRequiredMixin, PermissionListMixin, ListView): return super().get_context_data(**kwargs) def get_queryset(self): - return super().get_queryset().order_by("order").select_subclasses() + return super().get_queryset().select_subclasses() class PolicyCreateView(