You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2022/04/14 02:41:09 UTC
[GitHub] [dolphinscheduler] chncaesar opened a new pull request, #9492: Add ingress annotations
chncaesar opened a new pull request, #9492:
URL: https://github.com/apache/dolphinscheduler/pull/9492
<!--Thanks very much for contributing to Apache DolphinScheduler. Please review https://dolphinscheduler.apache.org/en-us/community/development/pull-request.html before opening a pull request.-->
## Purpose of the pull request
This PR adds ingress annotations and is related to Issue #9486
## Brief change log
- Add ingress metadata annotations in ingress.yaml
- Add default annotations to ingress
## Verify this pull request
Manually tested this pr by deploying DolphinScheduler to Azure CN K8S (AKS) with values.yaml.
```
ingress:
enabled: true
path: "/dolphinscheduler"
annotations:
nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/14
```
And ip within the whitelist is allowed to access dolpinscheduler.
We're using nginx-ingress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] kezhenxu94 merged pull request #9492: Add ingress annotations
Posted by GitBox <gi...@apache.org>.
kezhenxu94 merged PR #9492:
URL: https://github.com/apache/dolphinscheduler/pull/9492
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] zhongjiajie commented on pull request #9492: Add ingress annotations
Posted by GitBox <gi...@apache.org>.
zhongjiajie commented on PR #9492:
URL: https://github.com/apache/dolphinscheduler/pull/9492#issuecomment-1099924227
Do you have time to take a look at this PR @kezhenxu94
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] sonarcloud[bot] commented on pull request #9492: Add ingress annotations
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on PR #9492:
URL: https://github.com/apache/dolphinscheduler/pull/9492#issuecomment-1098665044
Kudos, SonarCloud Quality Gate passed! [](https://sonarcloud.io/dashboard?id=apache-dolphinscheduler&pullRequest=9492)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=9492&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=9492&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=9492&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=9492&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=9492&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=9492&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=9492&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=9492&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=9492&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=9492&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=9492&resolved=false&types=CODE_SMELL) [0 Code Smells](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=9492&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=9492&metric=coverage&view=list) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=9492&metric=duplicated_lines_density&view=list) No Duplication information
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] codecov-commenter commented on pull request #9492: Add ingress annotations
Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on PR #9492:
URL: https://github.com/apache/dolphinscheduler/pull/9492#issuecomment-1098662352
# [Codecov](https://codecov.io/gh/apache/dolphinscheduler/pull/9492?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#9492](https://codecov.io/gh/apache/dolphinscheduler/pull/9492?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (ce1a77b) into [dev](https://codecov.io/gh/apache/dolphinscheduler/commit/df791a374edb63bff6efd20bc85cad60d945e750?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (df791a3) will **increase** coverage by `0.02%`.
> The diff coverage is `n/a`.
```diff
@@ Coverage Diff @@
## dev #9492 +/- ##
============================================
+ Coverage 39.86% 39.89% +0.02%
Complexity 4415 4415
============================================
Files 826 826
Lines 33255 33258 +3
Branches 3683 3683
============================================
+ Hits 13257 13268 +11
+ Misses 18766 18759 -7
+ Partials 1232 1231 -1
```
| [Impacted Files](https://codecov.io/gh/apache/dolphinscheduler/pull/9492?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [...er/master/dispatch/host/assign/RandomSelector.java](https://codecov.io/gh/apache/dolphinscheduler/pull/9492/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZG9scGhpbnNjaGVkdWxlci1tYXN0ZXIvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL2RvbHBoaW5zY2hlZHVsZXIvc2VydmVyL21hc3Rlci9kaXNwYXRjaC9ob3N0L2Fzc2lnbi9SYW5kb21TZWxlY3Rvci5qYXZh) | `77.77% <0.00%> (-5.56%)` | :arrow_down: |
| [...org/apache/dolphinscheduler/remote/utils/Host.java](https://codecov.io/gh/apache/dolphinscheduler/pull/9492/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZG9scGhpbnNjaGVkdWxlci1yZW1vdGUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL2RvbHBoaW5zY2hlZHVsZXIvcmVtb3RlL3V0aWxzL0hvc3QuamF2YQ==) | `37.77% <0.00%> (-2.23%)` | :arrow_down: |
| [...e/dolphinscheduler/remote/NettyRemotingClient.java](https://codecov.io/gh/apache/dolphinscheduler/pull/9492/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZG9scGhpbnNjaGVkdWxlci1yZW1vdGUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL2RvbHBoaW5zY2hlZHVsZXIvcmVtb3RlL05ldHR5UmVtb3RpbmdDbGllbnQuamF2YQ==) | `52.11% <0.00%> (-1.41%)` | :arrow_down: |
| [...che/dolphinscheduler/alert/AlertSenderService.java](https://codecov.io/gh/apache/dolphinscheduler/pull/9492/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZG9scGhpbnNjaGVkdWxlci1hbGVydC9kb2xwaGluc2NoZWR1bGVyLWFsZXJ0LXNlcnZlci9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvZG9scGhpbnNjaGVkdWxlci9hbGVydC9BbGVydFNlbmRlclNlcnZpY2UuamF2YQ==) | `54.33% <0.00%> (-0.07%)` | :arrow_down: |
| [...org/apache/dolphinscheduler/alert/AlertServer.java](https://codecov.io/gh/apache/dolphinscheduler/pull/9492/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZG9scGhpbnNjaGVkdWxlci1hbGVydC9kb2xwaGluc2NoZWR1bGVyLWFsZXJ0LXNlcnZlci9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvZG9scGhpbnNjaGVkdWxlci9hbGVydC9BbGVydFNlcnZlci5qYXZh) | `51.35% <0.00%> (ø)` | |
| [...java/org/apache/dolphinscheduler/dao/AlertDao.java](https://codecov.io/gh/apache/dolphinscheduler/pull/9492/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZG9scGhpbnNjaGVkdWxlci1kYW8vc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL2RvbHBoaW5zY2hlZHVsZXIvZGFvL0FsZXJ0RGFvLmphdmE=) | `31.45% <0.00%> (+5.52%)` | :arrow_up: |
| [.../org/apache/dolphinscheduler/dao/entity/Alert.java](https://codecov.io/gh/apache/dolphinscheduler/pull/9492/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZG9scGhpbnNjaGVkdWxlci1kYW8vc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL2RvbHBoaW5zY2hlZHVsZXIvZGFvL2VudGl0eS9BbGVydC5qYXZh) | `71.87% <0.00%> (+17.44%)` | :arrow_up: |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/dolphinscheduler/pull/9492?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/dolphinscheduler/pull/9492?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [df791a3...ce1a77b](https://codecov.io/gh/apache/dolphinscheduler/pull/9492?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] chncaesar commented on pull request #9492: Add ingress annotations
Posted by GitBox <gi...@apache.org>.
chncaesar commented on PR #9492:
URL: https://github.com/apache/dolphinscheduler/pull/9492#issuecomment-1103422851
Here's the test result, sorry it's late.
### 环境介绍
DolphinScheduler 部署在 AKS，使用 ingress 暴露公网 IP。下面将公网 IP 隐去。
### 前后对比
添加 IP 白名单前 Ingress yaml 文件
```
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: dolphin
labels:
app.kubernetes.io/name: dolphin
app.kubernetes.io/instance: dolphin
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: 1.3.9
spec:
rules:
- host:
http:
paths:
- path: /dolphinscheduler
backend:
service:
name: dolphin-api
port:
name: api-port
pathType: Prefix
```
curl 访问 DS 登录页，返回 Status 200
`curl -i http://<public_ip>/dolphinscheduler/ui/view/login/index.html`
```text
HTTP/1.1 200 OK
Content-Length: 1109
Accept-Ranges: bytes
Connection: keep-alive
Content-Type: text/html
Date: Wed, 20 Apr 2022 02:49:53 GMT
```
values.yaml 增加 IP 白名单
```yaml
ingress:
enabled: true
#host: "dolphinscheduler.org"
path: "/dolphinscheduler"
annotations:
nginx.ingress.kubernetes.io/whitelist-source-range: 192.168.1.0/8
```
ingress yaml 多了 annotations
```yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: dolphin
labels:
app.kubernetes.io/name: dolphin
app.kubernetes.io/instance: dolphin
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: 1.3.9
annotations:
nginx.ingress.kubernetes.io/whitelist-source-range: 192.168.1.0/8
spec:
rules:
- host:
http:
paths:
- path: /dolphinscheduler
backend:
service:
name: dolphin-api
port:
name: api-port
pathType: Prefix
```
再次执行 `curl`，报 403 错误。
```
curl -i http://<public_ip>/dolphinscheduler/ui/view/login/index.html
HTTP/1.1 403 Forbidden
Server: nginx/1.19.1
Date: Wed, 20 Apr 2022 03:00:40 GMT
Content-Type: text/html
Content-Length: 153
Connection: keep-alive
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org