Merge branch 'main' of github.com:drycc/controller into main

Author: duanhongyi

README.md

@@ -1,6 +1,6 @@
 # Drycc Controller
 
-[![Build Status](https://drone.drycc.cc/api/badges/drycc/controller/status.svg)](https://drone.drycc.cc/drycc/controller)
+[![Build Status](https://woodpecker.drycc.cc/api/badges/drycc/controller/status.svg)](https://woodpecker.drycc.cc/drycc/controller)
 [![codecov.io](https://codecov.io/github/drycc/controller/coverage.svg?branch=main)](https://codecov.io/github/drycc/controller?branch=main)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdrycc%2Fcontroller.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fdrycc%2Fcontroller?ref=badge_shield)
 
@@ -80,4 +80,4 @@ kubectl get pod --namespace=drycc -w | grep drycc-controller
 
 
 ## License
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdrycc%2Fcontroller.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fdrycc%2Fcontroller?ref=badge_large)
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdrycc%2Fcontroller.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fdrycc%2Fcontroller?ref=badge_large)

charts/controller/templates/_helpers.tpl

@@ -26,6 +26,10 @@ env:
 - name: "DRYCC_APP_RUNTIME_CLASS"
   value: "{{ .Values.appRuntimeClass }}"
 {{- end }}
+{{- if (.Values.appDNSPolicy) }}
+- name: "DRYCC_APP_DNS_POLICY"
+  value: "{{ .Values.appDNSPolicy }}"
+{{- end }}
 {{- if (.Values.appPodExecTimeout) }}
 - name: "DRYCC_APP_POD_EXEC_TIMEOUT"
   value: "{{ .Values.appPodExecTimeout }}"

charts/controller/values.yaml

@@ -20,6 +20,9 @@ k8sApiVerifyTls: "true"
 appStorageClass: "drycc-storage"
 # Set runtimeClassName. It is used for application.
 appRuntimeClass: ""
+# Set appDNSPolicy. It is used for application.
+# See: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy
+appDNSPolicy: ""
 # set timeout seconds. It is used for pod exec
 appPodExecTimeout: 3600
 # Set api replicas

rootfs/api/models/app.py

@@ -153,8 +153,11 @@ def _get_entrypoint(self, container_type):
         """
         Return the kubernetes "container command" to be sent off to the scheduler.
         """
-        entrypoint = ['/bin/sh', '-c']
+        entrypoint = []
         release = self.release_set.filter(failed=False).latest()
+        if release is not None and release.build is not None:
+            if release.build.procfile and container_type in release.build.procfile:
+                entrypoint = ['/bin/sh', '-c']
         if self._get_stack(release) == "buildpack":
             if container_type in release.build.procfile:
                 entrypoint = [container_type]
@@ -1113,6 +1116,7 @@ def _gather_app_settings(self, release, app_settings, process_type, replicas, vo
             'annotations': json.loads(settings.KUBERNETES_POD_DEFAULT_ANNOTATIONS),
             'healthcheck': healthcheck,
             'runtime_class_name': settings.DRYCC_APP_RUNTIME_CLASS,
+            'dns_policy': settings.DRYCC_APP_DNS_POLICY,
             'lifecycle_post_start': config.lifecycle_post_start,
             'lifecycle_pre_stop': config.lifecycle_pre_stop,
             'routable': routable,

rootfs/api/settings/production.py

@@ -330,6 +330,8 @@
 
 DRYCC_APP_RUNTIME_CLASS = os.environ.get('DRYCC_APP_RUNTIME_CLASS', "")
 
+DRYCC_APP_DNS_POLICY = os.environ.get('DRYCC_APP_DNS_POLICY', "")
+
 DRYCC_APP_POD_EXEC_TIMEOUT = int(os.environ.get('DRYCC_APP_POD_EXEC_TIMEOUT', "3600"))
 
 DRYCC_DEFAULT_CONFIG_TAGS = os.environ.get('DRYCC_DEFAULT_CONFIG_TAGS', '')
@@ -350,17 +352,17 @@
 KUBERNETES_REQUEST_MEMORY_RATIO = int(os.environ.get('KUBERNETES_REQUEST_MEMORY_RATIO', '2'))
 
 # Minimum CPU limit, units are represented in the millicpu of CPUs
-KUBERNETES_LIMITS_MIN_CPU = 125
+KUBERNETES_LIMITS_MIN_CPU = int(os.environ.get('KUBERNETES_LIMITS_MIN_CPU', '125'))
 # Max CPU limit, units are represented in the millicpu of CPUs
-KUBERNETES_LIMITS_MAX_CPU = 32 * 1000
+KUBERNETES_LIMITS_MAX_CPU = int(os.environ.get('KUBERNETES_LIMITS_MAX_CPU', 32 * 1000))
 # Minimum Memory limit, units are represented in Megabytes(M)
-KUBERNETES_LIMITS_MIN_MEMORY = 128
+KUBERNETES_LIMITS_MIN_MEMORY = int(os.environ.get('KUBERNETES_LIMITS_MIN_MEMORY', '128'))
 # Max Memory limit, units are represented in Megabytes(M)
-KUBERNETES_LIMITS_MAX_MEMORY = 128 * 1024
+KUBERNETES_LIMITS_MAX_MEMORY = int(os.environ.get('KUBERNETES_LIMITS_MAX_MEMORY', 128 * 1024))
 # Minimum Stroage Volume limit, units are represented in Gigabytes(G)
-KUBERNETES_LIMITS_MIN_VOLUME = 1
+KUBERNETES_LIMITS_MIN_VOLUME = int(os.environ.get('KUBERNETES_LIMITS_MIN_VOLUME', 1))
 # Max Stroage Volume limit, units are represented in Gigabytes(G)
-KUBERNETES_LIMITS_MAX_VOLUME = 1024 * 16
+KUBERNETES_LIMITS_MAX_VOLUME = int(os.environ.get('KUBERNETES_LIMITS_MAX_VOLUME', 1024 * 16))
 
 # Default pod spec for application.
 KUBERNETES_POD_DEFAULT_RESOURCES = os.environ.get(

rootfs/api/tests/test_pods.py

@@ -589,7 +589,7 @@ def test_run_command_good(self, mock_requests):
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 200, response.data)
         app = App.objects.get(id=app_id)
-        self.assertEqual(app._get_entrypoint('cmd'), ['/bin/sh', '-c'])
+        self.assertEqual(app._get_entrypoint('cmd'), [])
 
         # procfile workflow
         build.sha = 'somereallylongsha'

rootfs/requirements.txt

@@ -1,6 +1,6 @@
 # Drycc controller requirements
 backoff==2.1.2
-django==4.1.2
+django==4.1.7
 channels==3.0.5
 aiohttp==v3.8.1
 django-cors-headers==3.13.0

rootfs/scheduler/resources/pod.py

@@ -158,6 +158,8 @@ def manifest(self, namespace, name, image, **kwargs):
         # pod runtimeClassName
         if kwargs.get('runtime_class_name', ''):
             spec['runtimeClassName'] = kwargs.get('runtime_class_name')
+        if kwargs.get('dns_policy', ''):
+            spec['dnsPolicy'] = kwargs.get('dns_policy')
 
         # what should the pod do if it exits
         spec['restartPolicy'] = kwargs.get('restart_policy', 'Always')