Skip to content

Commit 0d800d5

Browse files
Merge branch 'master' into docs-sandbox
2 parents 4a14378 + f3ab1b7 commit 0d800d5

File tree

22 files changed

+535
-216
lines changed

22 files changed

+535
-216
lines changed

charts/flyteconnector/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,13 @@ A Helm chart for Flyte connector
2626
| podAnnotations | object | `{}` | Annotations for flyteconnector pods |
2727
| podEnv | object | `{}` | Additional flyteconnector pod container environment variables |
2828
| podLabels | object | `{}` | Labels for flyteconnector pods |
29-
| podSecurityContext | object | `{}` | Security context for pod |
29+
| podSecurityContext | object | `{}` | |
3030
| ports.containerPort | int | `8000` | |
3131
| ports.name | string | `"connector-grpc"` | |
3232
| priorityClassName | string | `""` | Sets priorityClassName for datacatalog pod(s). |
33+
| rbac | object | `{"enabled":false,"rules":[{"apiGroups":[""],"resources":["secrets"],"verbs":["get"]}]}` | RBAC configuration for flyteconnector Enable to allow the connector to read secrets across namespaces (required for per-project Databricks token authentication) |
34+
| rbac.enabled | bool | `false` | Should RBAC resources (ClusterRole/ClusterRoleBinding) be created for flyteconnector |
35+
| rbac.rules | list | `[{"apiGroups":[""],"resources":["secrets"],"verbs":["get"]}]` | Rules for the ClusterRole created for flyteconnector |
3336
| readinessProbe | object | `{"grpc":{"port":8000},"initialDelaySeconds":1,"periodSeconds":3}` | https://kubernetes.io/blog/2022/05/13/grpc-probes-now-in-beta/#trying-the-feature-out |
3437
| replicaCount | int | `1` | Replicas count for flyteconnector deployment |
3538
| resources | object | `{"limits":{"cpu":"500m","ephemeral-storage":"200Mi","memory":"300Mi"},"requests":{"cpu":"500m","ephemeral-storage":"200Mi","memory":"200Mi"}}` | Default resources requests and limits for flyteconnector deployment |
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{{- if .Values.rbac.enabled }}
2+
{{- if $.Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }}
3+
apiVersion: rbac.authorization.k8s.io/v1
4+
{{- else }}
5+
apiVersion: rbac.authorization.k8s.io/v1beta1
6+
{{- end }}
7+
kind: ClusterRole
8+
metadata:
9+
name: {{ template "flyte.namespace" . -}}-{{- template "flyteconnector.name" . }}
10+
labels: {{ include "flyteconnector.labels" . | nindent 4 }}
11+
rules:
12+
{{- toYaml .Values.rbac.rules | nindent 2 }}
13+
---
14+
{{- if $.Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }}
15+
apiVersion: rbac.authorization.k8s.io/v1
16+
{{- else }}
17+
apiVersion: rbac.authorization.k8s.io/v1beta1
18+
{{- end }}
19+
kind: ClusterRoleBinding
20+
metadata:
21+
name: {{ template "flyte.namespace" . -}}-{{- template "flyteconnector.name" . }}
22+
labels: {{ include "flyteconnector.labels" . | nindent 4 }}
23+
roleRef:
24+
apiGroup: rbac.authorization.k8s.io
25+
kind: ClusterRole
26+
name: {{ template "flyte.namespace" . -}}-{{- template "flyteconnector.name" . }}
27+
subjects:
28+
- kind: ServiceAccount
29+
name: {{ template "flyteconnector.name" . }}
30+
namespace: {{ template "flyte.namespace" . }}
31+
{{- end }}

charts/flyteconnector/values.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,20 @@ serviceAccount:
5555
# -- ImagePullSecrets to automatically assign to the service account
5656
imagePullSecrets: []
5757
# -- Security context for pod
58+
# -- RBAC configuration for flyteconnector
59+
# Enable to allow the connector to read secrets across namespaces
60+
# (required for per-project Databricks token authentication)
61+
rbac:
62+
# -- Should RBAC resources (ClusterRole/ClusterRoleBinding) be created for flyteconnector
63+
enabled: false
64+
# -- Rules for the ClusterRole created for flyteconnector
65+
rules:
66+
- apiGroups:
67+
- ""
68+
resources:
69+
- secrets
70+
verbs:
71+
- get
5872
podSecurityContext: {}
5973
# -- Readiness probe for flyteconnector. Use readinessProbe: {} if connector doesn't implement grpc-health-checking service.
6074
# -- https://kubernetes.io/blog/2022/05/13/grpc-probes-now-in-beta/#trying-the-feature-out

docker/sandbox-bundled/manifests/complete-connector.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ type: Opaque
818818
---
819819
apiVersion: v1
820820
data:
821-
haSharedSecret: QVFvWkR6MTFBeWVRWkIzMQ==
821+
haSharedSecret: ZFpmeWZLVmZ6ZzhMV0psSQ==
822822
proxyPassword: ""
823823
proxyUsername: ""
824824
kind: Secret
@@ -1411,7 +1411,7 @@ spec:
14111411
metadata:
14121412
annotations:
14131413
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
1414-
checksum/secret: 3dc01bc4d059fe7cfd6ca3f7490d845687c83fed34a3c25125c98f061e144773
1414+
checksum/secret: 71159d2415422039ebe465274c540ff4c8c0182c7015bd85bb09cc081783a878
14151415
labels:
14161416
app: docker-registry
14171417
release: flyte-sandbox

docker/sandbox-bundled/manifests/complete.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ type: Opaque
799799
---
800800
apiVersion: v1
801801
data:
802-
haSharedSecret: aERjSWllc0lpaXU3TW1ydQ==
802+
haSharedSecret: b1lSRHRpdENtdGowWk1ZZw==
803803
proxyPassword: ""
804804
proxyUsername: ""
805805
kind: Secret
@@ -1359,7 +1359,7 @@ spec:
13591359
metadata:
13601360
annotations:
13611361
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
1362-
checksum/secret: c66800633a13747d593cc75f8d34685d393e3ea37247bd50543e62b4e6f4ec30
1362+
checksum/secret: 8394060dce1922bee28083015f7ba9ec188e2486c8600677a029263d32497a78
13631363
labels:
13641364
app: docker-registry
13651365
release: flyte-sandbox

docker/sandbox-bundled/manifests/dev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ metadata:
495495
---
496496
apiVersion: v1
497497
data:
498-
haSharedSecret: VFBweDNCTHNtelB4UTBKbQ==
498+
haSharedSecret: RkhkcWpPZ21BS1NVNzNYaw==
499499
proxyPassword: ""
500500
proxyUsername: ""
501501
kind: Secret
@@ -926,7 +926,7 @@ spec:
926926
metadata:
927927
annotations:
928928
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
929-
checksum/secret: 095e3fa8df1438e232b708217c8a96adaac9b96414ec6237c31585298db31825
929+
checksum/secret: 303a3c79c8841470d592eb349e62fbe5dcce82820f87a3d37d18693159a41799
930930
labels:
931931
app: docker-registry
932932
release: flyte-sandbox

flyteadmin/auth/cookie_manager_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ func TestExtractAccessTokenFromCookies(t *testing.T) {
315315
t.Logf("Cookie 1 raw decoded (first 50 bytes): %s", string(decoded[:50]))
316316
}
317317
s := securecookie.New(hashKey, blockKey)
318+
s.MaxAge(0) // Disable timestamp validation so hardcoded cookies don't expire
318319
var firstHalf string
319320
err = s.Decode("flyte_at_1", cookieValue1, &firstHalf)
320321
if err != nil {
@@ -323,6 +324,7 @@ func TestExtractAccessTokenFromCookies(t *testing.T) {
323324
err2 := s2.Decode("flyte_at_1", cookieValue1, &firstHalf)
324325
t.Logf("Error with validation enabled: %v", err2)
325326
}
327+
326328
require.NoError(t, err)
327329
t.Logf("First half of access token: %s", firstHalf)
328330

flyteidl/clients/go/assets/admin.swagger.json

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flyteidl/gen/pb-es/flyteidl/core/workflow_pb.ts

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)