Stage

.helm/templates/configs/cm.yaml

@@ -9,14 +9,3 @@ data:
   {{ $conf_key  }}: {{ $conf_value | quote }}
 {{- end}}
   DB_HOST: {{ .Release.Name }}-postgresql
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "sunflower.fullname" . }}-docs
-  labels:
-    {{- include "sunflower.labels.docs" . | nindent 4 }}
-data:
-{{- range $conf_key,$conf_value := .Values.docs.configs }}
-  {{ $conf_key  }}: {{ $conf_value | quote }}
-{{- end}}

.helm/templates/configs/secret.yaml

@@ -5,12 +5,3 @@ metadata:
   labels:
     {{- include "sunflower.labels.application" . | nindent 4 }}
 data:
-
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "sunflower.fullname" . }}-docs
-  labels:
-    {{- include "sunflower.labels.docs" . | nindent 4 }}
-data:

.helm/values.yaml

@@ -147,80 +147,3 @@ application:
   tolerations: []
 
   affinity: {}
-
-
-docs:
-  nodeSelector: {}
-
-  tolerations: []
-
-  affinity: {}
-
-  resources: {}
-    # We usually recommend not to specify default resources and to leave this as a conscious
-    # choice for the user. This also increases chances charts run on environments with little
-    # resources, such as Minikube. If you do want to specify resources, uncomment the following
-    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-    # limits:
-    #   cpu: 100m
-    #   memory: 128Mi
-    # requests:
-    #   cpu: 100m
-    #   memory: 128Mi
-  configs: {}
-    # ENV_NAME: eaxmple
-
-  replicaCount: 1
-
-  image:
-    repository: ghcr.io/amazeit/sunflower/sunflower
-    pullPolicy: IfNotPresent
-    # Overrides the image tag whose default is the chart appVersion.
-    tag:
-
-  imagePullSecrets: []
-  nameOverride: ""
-  fullnameOverride: ""
-
-  serviceAccount:
-    # Specifies whether a service account should be created
-    create: true
-    # Annotations to add to the service account
-    annotations: {}
-    # The name of the service account to use.
-    # If not set and create is true, a name is generated using the fullname template
-    name: ""
-
-  podAnnotations: {}
-
-  podSecurityContext: {}
-    # fsGroup: 2000
-
-  securityContext: {}
-    # capabilities:
-    #   drop:
-    #   - ALL
-    # readOnlyRootFilesystem: true
-    # runAsNonRoot: true
-    # runAsUser: 1000
-
-  service:
-    type: ClusterIP
-    port: 80
-
-  ingress:
-    enabled: false
-    className: ""
-    annotations:
-      external-dns.kubernetes.io/class: cloudflare
-      # nginx.ingress.kubernetes.io/rewrite-target: /$2
-      # nginx.ingress.kubernetes.io/use-regex: "true"
-    hosts:
-      - host: api.example.local
-        paths:
-          - path: /docs/
-            pathType: ImplementationSpecific
-    tls: []
-    #  - secretName: chart-example-tls
-    #    hosts:
-    #      - chart-example.local

ocsp/views.py

@@ -1,7 +1,7 @@
 from cryptography.x509 import ocsp
 from django.http import HttpResponse
 from django.views.decorators.csrf import csrf_exempt
-from django_filters.rest_framework import DjangoFilterBackend
+from django_filters import rest_framework
 from rest_framework import permissions, viewsets
 from rest_framework.response import Response
 
@@ -124,7 +124,7 @@ class SourceViewSet(viewsets.ModelViewSet):
     queryset = Source.objects.all()
     serializer_class = SourceSerializer
     permission_classes = [permissions.IsAuthenticated]
-    filter_backends = [DjangoFilterBackend]
+    filter_backends = [rest_framework.DjangoFilterBackend]
     filterset_fields = ["name", "host", "addr"]
 
     def create(self, request, *args, **kwargs):
@@ -185,10 +185,29 @@ def list(self, request, *args, **kwargs):
         return super().list(request, *args, **kwargs)
 
 
+class RequestLogFilterSet(rest_framework.FilterSet):
+    date = rest_framework.DateFromToRangeFilter()
+    cert = rest_framework.ModelChoiceFilter(
+        queryset=Certificate.objects.all(), null_label="null"
+    )
+
+    class Meta:
+        model = RequestLog
+        fields = [
+            "date",
+            "cert",
+            "host",
+            "addr",
+            "result",
+        ]
+
+
 class RequestLogViewSet(viewsets.ModelViewSet):
     queryset = RequestLog.objects.all()
     serializer_class = RequestLogSerializer
     permission_classes = [permissions.IsAuthenticated]
+    filter_backends = [rest_framework.DjangoFilterBackend]
+    filterset_class = RequestLogFilterSet
 
     http_method_names = ["get"]
 

sunflower/urls.py

@@ -99,6 +99,6 @@
         name="redoc",
     ),
     # Non versioned views
-    path("crl/<str:ca_slug>.<str:format>", crl_view, name="crl"),
+    path("crl/<int:ca_sn>.<str:format>", crl_view, name="crl"),
     path("ocsp/", ocsp_view, name="ocsp"),
 ]

werf.yaml

@@ -4,7 +4,3 @@ project: sunflower
 image: application
 dockerfile: Dockerfile
 context: .
----
-image: docs
-dockerfile: docs/Dockerfile
-context: .