forked from alibaba/higress
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
support ingress secret&skip mcp validate (alibaba#36)
- Loading branch information
Showing
4 changed files
with
76 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| {{- if .Values.gateway.rbac.enabled }} | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRole | ||
| metadata: | ||
| name: {{ include "gateway.serviceAccountName" . }}-{{ .Release.Namespace }} | ||
| rules: | ||
| - apiGroups: [""] | ||
| resources: ["secrets"] | ||
| verbs: ["get", "watch", "list"] | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRoleBinding | ||
| metadata: | ||
| name: {{ include "gateway.serviceAccountName" . }}-{{ .Release.Namespace }} | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: ClusterRole | ||
| name: {{ include "gateway.serviceAccountName" . }}-{{ .Release.Namespace }} | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: {{ include "gateway.serviceAccountName" . }} | ||
| namespace: {{ .Release.Namespace }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff -Naur istio/pilot/pkg/bootstrap/configcontroller.go new/pilot/pkg/bootstrap/configcontroller.go | ||
| --- istio/pilot/pkg/bootstrap/configcontroller.go 2022-11-07 21:47:11.000000000 +0800 | ||
| +++ new/pilot/pkg/bootstrap/configcontroller.go 2022-11-07 21:50:31.000000000 +0800 | ||
| @@ -250,7 +250,7 @@ | ||
| if err != nil { | ||
| return fmt.Errorf("failed to dial XDS %s %v", configSource.Address, err) | ||
| } | ||
| - store := memory.Make(collections.Pilot) | ||
| + store := memory.MakeSkipValidation(collections.Pilot) | ||
| configController := memory.NewController(store) | ||
| configController.RegisterHasSyncedHandler(xdsMCP.HasSynced) | ||
| xdsMCP.Store = model.MakeIstioStore(configController) |
37 changes: 37 additions & 0 deletions
37
istio/1.12/patches/istio/20221107-support-ingress-secret.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| diff -Naur istio/pilot/pkg/model/credentials/ali_resource.go new/pilot/pkg/model/credentials/ali_resource.go | ||
| --- istio/pilot/pkg/model/credentials/ali_resource.go 2022-11-07 21:40:10.000000000 +0800 | ||
| +++ new/pilot/pkg/model/credentials/ali_resource.go 2022-11-07 19:03:22.000000000 +0800 | ||
| @@ -4,6 +4,7 @@ | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| + "istio.io/istio/pilot/pkg/features" | ||
| "istio.io/istio/pkg/cluster" | ||
| ) | ||
|
|
||
| @@ -13,6 +14,9 @@ | ||
| ) | ||
|
|
||
| func ToKubernetesIngressResource(clusterId, namespace, name string) string { | ||
| + if clusterId == "" { | ||
| + clusterId = features.ClusterName | ||
| + } | ||
| return fmt.Sprintf("%s://%s/%s/%s", KubernetesIngressSecretType, clusterId, namespace, name) | ||
| } | ||
|
|
||
| diff -Naur istio/pilot/pkg/xds/sds.go new/pilot/pkg/xds/sds.go | ||
| --- istio/pilot/pkg/xds/sds.go 2022-11-07 21:40:10.000000000 +0800 | ||
| +++ new/pilot/pkg/xds/sds.go 2022-11-07 21:44:28.000000000 +0800 | ||
| @@ -229,6 +229,12 @@ | ||
| } else { | ||
| deniedResources = append(deniedResources, r.Name) | ||
| } | ||
| + case credentials.KubernetesIngressSecretType: | ||
| + if isAuthorized() { | ||
| + allowedResources = append(allowedResources, r) | ||
| + } else { | ||
| + deniedResources = append(deniedResources, r.Name) | ||
| + } | ||
| default: | ||
| // Should never happen | ||
| log.Warnf("unknown credential type %q", r.Type) |