Skip to content

Commit e2fb972

Browse files
jianxiaoguoduanhongyi
authored andcommitted
chore(grafana): up ldap api_url config
1 parent 357d44c commit e2fb972

3 files changed

Lines changed: 1 addition & 21 deletions

File tree

.woodpecker/chart.yaml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,6 @@ platform: linux/amd64
33
labels:
44
type: exec
55

6-
- name: generate chart
7-
commands:
8-
- IMAGE_TAG=$([ ! -z $DRONE_TAG ] && echo \"${DRONE_TAG:1}\" || echo \"canary\")
9-
- sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/monitor/values.yaml
10-
- helm package -u charts/monitor --version $([ -z $DRONE_TAG ] && echo 1.0.0 || echo ${DRONE_TAG#v})
11-
- echo $CONTAINER_PASSWORD | helm registry login $DRYCC_REGISTRY -u $CONTAINER_USERNAME --password-stdin
12-
- helm push monitor-$([ -z $DRONE_TAG ] && echo 1.0.0 || echo ${DRONE_TAG#v}).tgz oci://$DRYCC_REGISTRY/$([ -z $DRONE_TAG ] && echo charts-testing || echo charts)
13-
environment:
14-
DRYCC_REGISTRY:
15-
from_secret: drycc_registry
16-
CONTAINER_USERNAME:
17-
from_secret: container_username
18-
CONTAINER_PASSWORD:
19-
from_secret: container_password
20-
when:
21-
event:
22-
- push
23-
- tag
24-
256
pipeline:
267
- name: generate-chart
278
type: local

.woodpecker/test-linux.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ pipeline:
1212
- name: test-linux
1313
image: bash
1414
commands:
15-
- mkdir -p $HOMEPATH/.docker; echo $IMAGE_PULL_SECRETS > $HOMEPATH/.docker/config.json
1615
- cd grafana && make test && cd ..
1716
- cd telegraf && make test && cd ..
1817
secrets:

grafana/rootfs/usr/share/grafana/grafana.ini.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ client_secret = {{ .DRYCC_PASSPORT_SECRET }}
239239
scopes = profile,openid
240240
auth_url = {{ .DRYCC_PASSPORT_URL }}/oauth/authorize/
241241
token_url = {{ .DRYCC_PASSPORT_URL }}/oauth/token/
242-
api_url = {{ .DRYCC_PASSPORT_URL }}
242+
api_url = {{ .DRYCC_PASSPORT_URL }}/oauth/userinfo/
243243
allow_sign_up = true
244244
tls_skip_verify_insecure = true
245245
role_attribute_path = (is_superuser && 'Admin') || (is_staff && 'Viewer') || ''

0 commit comments

Comments
 (0)