Skip to content

Commit 3841411

Browse files
authored
chore(controller): no longer restrict reserved domain
1 parent 56f4685 commit 3841411

5 files changed

Lines changed: 0 additions & 13 deletions

File tree

charts/controller/templates/_helpers.tpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ env:
66
# Environmental variable value for $GATEWAY_CLASS
77
- name: "DRYCC_GATEWAY_CLASS"
88
value: "{{ .Values.global.gatewayClass }}"
9-
- name: "DRYCC_PLATFORM_DOMAIN"
10-
value: "{{ .Values.global.platformDomain }}"
119
- name: "K8S_API_VERIFY_TLS"
1210
value: "{{ .Values.k8sApiVerifyTls }}"
1311
- name: "DRYCC_REGISTRY_LOCATION"

rootfs/api/serializers.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,9 +403,6 @@ def validate_domain(value):
403403
if value == "*":
404404
raise serializers.ValidationError("Hostname can't only be a wildcard")
405405

406-
if value.endswith(".{}".format(settings.PLATFORM_DOMAIN)):
407-
raise serializers.ValidationError("This is a reserved domain")
408-
409406
labels = value.split('.')
410407

411408
# Let wildcards through by not trying to validate it

rootfs/api/settings/production.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,6 @@
280280
# gateway class name
281281
GATEWAY_CLASS = os.environ.get('DRYCC_GATEWAY_CLASS', '')
282282

283-
PLATFORM_DOMAIN = os.environ.get('DRYCC_PLATFORM_DOMAIN', 'local.drycc.cc')
284-
285283
IMAGE_PULL_POLICY = os.environ.get('IMAGE_PULL_POLICY', "IfNotPresent")
286284

287285
# True, true, yes, y and more evaluate to True

rootfs/api/tests/test_domain.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ def test_manage_domain_invalid_domain(self):
279279
'django.pa--assandbox',
280280
'too.looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
281281
'foo.*.bar.com',
282-
'test.local.drycc.cc',
283282
'*',
284283
'a' * 300,
285284
'.'.join(['a'] * 128)

rootfs/api/views.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -412,11 +412,6 @@ def get_object(self, **kwargs):
412412

413413
def destroy(self, request, **kwargs):
414414
domain = self.get_object()
415-
if "%s.%s" % (domain.app.id, settings.PLATFORM_DOMAIN) == domain.domain:
416-
return Response(
417-
data="the default domain cannot be deleted",
418-
status=status.HTTP_403_FORBIDDEN
419-
)
420415
domain.delete()
421416
return Response(status=status.HTTP_204_NO_CONTENT)
422417

0 commit comments

Comments
 (0)