Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor fsm-connector #133

Merged
merged 38 commits into from
Dec 1, 2023
Merged

refactor fsm-connector #133

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e6c871b
traffic split based on eureka metadata
cybwan Nov 20, 2023
f07815f
refactor connector
cybwan Nov 27, 2023
3662665
refactor connector
cybwan Nov 27, 2023
15e03ea
refactor connector
cybwan Nov 28, 2023
cab0642
refactor connector
cybwan Nov 28, 2023
a0228d0
refactor connector
cybwan Nov 28, 2023
f81fd41
refactor fsm-connector
cybwan Nov 28, 2023
a580587
refactor fsm-connector
cybwan Nov 28, 2023
3729652
refactor fsm-connector
cybwan Nov 28, 2023
176bac8
refactor fsm-connector
cybwan Nov 28, 2023
a9afb53
refactor fsm-connector
cybwan Nov 28, 2023
53e9328
refactor fsm-connector
cybwan Nov 28, 2023
2d5b2bb
refactor fsm-connector
cybwan Nov 28, 2023
22d9dcb
refactor fsm-connector
cybwan Nov 28, 2023
f2cb19b
refactor fsm-connector
cybwan Nov 29, 2023
16e473d
refactor fsm-connector
cybwan Nov 29, 2023
f796808
refactor fsm-connector
cybwan Nov 29, 2023
73252b0
refactor fsm-connector
cybwan Nov 29, 2023
612f32c
refactor fsm-connector
cybwan Nov 29, 2023
a1927e6
refactor fsm-connector
cybwan Nov 29, 2023
a392667
refactor fsm-connector
cybwan Nov 29, 2023
b6f9247
refactor fsm-connector
cybwan Nov 29, 2023
c02e8ed
refactor fsm-connector
cybwan Nov 29, 2023
c1ae0c7
refactor fsm-connector
cybwan Nov 29, 2023
e86df0c
refactor fsm-connector
cybwan Nov 29, 2023
7a51e6d
refactor fsm-connector
cybwan Nov 30, 2023
f6bda67
refactor fsm-connector
cybwan Nov 30, 2023
46fd22e
refactor fsm-connector
cybwan Nov 30, 2023
2481671
refactor fsm-connector
cybwan Nov 30, 2023
a983bb7
refactor fsm-connector
cybwan Nov 30, 2023
e133a0a
refactor fsm-connector
cybwan Nov 30, 2023
26b5e6c
refactor fsm-connector
cybwan Nov 30, 2023
84423dd
refactor fsm-connector
cybwan Nov 30, 2023
7b6ee45
refactor fsm-connector
cybwan Dec 1, 2023
b8e827e
refactor fsm-connector
cybwan Dec 1, 2023
1a90b0e
refactor fsm-connector
cybwan Dec 1, 2023
1e8f776
refactor fsm-connector
cybwan Dec 1, 2023
f59ba7a
refactor fsm-connector
cybwan Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor fsm-connector
  • Loading branch information
@cybwan
cybwan committed Nov 29, 2023
commit 612f32c459c7fb2cf2eb799732fdf8b242bf1523
55 changes: 43 additions & 12 deletions charts/fsm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,23 +95,54 @@ The following table lists the configurable parameters of the fsm chart and their
| fsm.cloudConnector.autoScale.minReplicas | int | `1` | Minimum replicas for autoscale |
| fsm.cloudConnector.consul.deriveNamespace | string | `""` | |
| fsm.cloudConnector.consul.enable | bool | `false` | |
| fsm.cloudConnector.consul.filterTag | string | `""` | |
| fsm.cloudConnector.consul.httpAddr | string | `"127.0.0.1:8500"` | |
| fsm.cloudConnector.consul.passingOnly | bool | `true` | |
| fsm.cloudConnector.consul.prefixTag | string | `""` | |
| fsm.cloudConnector.consul.suffixTag | string | `""` | |
| fsm.cloudConnector.consul.syncFromK8s | bool | `true` | |
| fsm.cloudConnector.consul.syncToK8s | bool | `true` | |
| fsm.cloudConnector.consul.syncFromK8S.addK8SNamespaceAsServiceSuffix | bool | `false` | |
| fsm.cloudConnector.consul.syncFromK8S.addServicePrefix | string | `""` | |
| fsm.cloudConnector.consul.syncFromK8S.allowK8sNamespaces[0] | string | `"*"` | |
| fsm.cloudConnector.consul.syncFromK8S.consulCrossNamespaceACLPolicy | string | `nil` | |
| fsm.cloudConnector.consul.syncFromK8S.consulDestinationNamespace | string | `"default"` | |
| fsm.cloudConnector.consul.syncFromK8S.consulEnableK8SNSMirroring | bool | `false` | |
| fsm.cloudConnector.consul.syncFromK8S.consulEnableNamespaces | bool | `false` | |
| fsm.cloudConnector.consul.syncFromK8S.consulK8SNSMirroringPrefix | string | `nil` | |
| fsm.cloudConnector.consul.syncFromK8S.consulK8STag | string | `"k8s"` | |
| fsm.cloudConnector.consul.syncFromK8S.consulNodeName | string | `"k8s-sync"` | |
| fsm.cloudConnector.consul.syncFromK8S.defaultSync | bool | `true` | |
| fsm.cloudConnector.consul.syncFromK8S.denyK8sNamespaces[0] | string | `""` | |
| fsm.cloudConnector.consul.syncFromK8S.enable | bool | `false` | |
| fsm.cloudConnector.consul.syncFromK8S.nodePortSyncType | string | `"ExternalOnly"` | |
| fsm.cloudConnector.consul.syncFromK8S.syncClusterIPServices | bool | `true` | |
| fsm.cloudConnector.consul.syncFromK8S.syncIngress | bool | `false` | |
| fsm.cloudConnector.consul.syncFromK8S.syncIngressLoadBalancerIPs | bool | `false` | |
| fsm.cloudConnector.consul.syncFromK8S.syncLoadBalancerEndpoints | bool | `false` | |
| fsm.cloudConnector.consul.syncFromK8S.withGatewayAPI | bool | `false` | |
| fsm.cloudConnector.consul.syncToK8S.enable | bool | `true` | |
| fsm.cloudConnector.consul.syncToK8S.filterTag | string | `""` | |
| fsm.cloudConnector.consul.syncToK8S.passingOnly | bool | `true` | |
| fsm.cloudConnector.consul.syncToK8S.prefixTag | string | `""` | |
| fsm.cloudConnector.consul.syncToK8S.suffixTag | string | `""` | |
| fsm.cloudConnector.consul.syncToK8S.withGatewayAPI | bool | `false` | |
| fsm.cloudConnector.enablePodDisruptionBudget | bool | `false` | Enable Pod Disruption Budget |
| fsm.cloudConnector.eureka.deriveNamespace | string | `""` | |
| fsm.cloudConnector.eureka.enable | bool | `false` | |
| fsm.cloudConnector.eureka.filterMetadata | string | `""` | |
| fsm.cloudConnector.eureka.httpAddr | string | `"127.0.0.1:8761/eureka"` | |
| fsm.cloudConnector.eureka.passingOnly | bool | `true` | |
| fsm.cloudConnector.eureka.prefixMetadata | string | `""` | |
| fsm.cloudConnector.eureka.suffixMetadata | string | `""` | |
| fsm.cloudConnector.eureka.syncFromK8s | bool | `true` | |
| fsm.cloudConnector.eureka.syncToK8s | bool | `true` | |
| fsm.cloudConnector.eureka.syncFromK8S.addK8SNamespaceAsServiceSuffix | bool | `false` | |
| fsm.cloudConnector.eureka.syncFromK8S.addServicePrefix | string | `""` | |
| fsm.cloudConnector.eureka.syncFromK8S.allowK8sNamespaces[0] | string | `"*"` | |
| fsm.cloudConnector.eureka.syncFromK8S.defaultSync | bool | `true` | |
| fsm.cloudConnector.eureka.syncFromK8S.denyK8sNamespaces[0] | string | `""` | |
| fsm.cloudConnector.eureka.syncFromK8S.enable | bool | `false` | |
| fsm.cloudConnector.eureka.syncFromK8S.nodePortSyncType | string | `"ExternalOnly"` | |
| fsm.cloudConnector.eureka.syncFromK8S.syncClusterIPServices | bool | `true` | |
| fsm.cloudConnector.eureka.syncFromK8S.syncIngress | bool | `false` | |
| fsm.cloudConnector.eureka.syncFromK8S.syncIngressLoadBalancerIPs | bool | `false` | |
| fsm.cloudConnector.eureka.syncFromK8S.syncLoadBalancerEndpoints | bool | `false` | |
| fsm.cloudConnector.eureka.syncFromK8S.withGatewayAPI | bool | `false` | |
| fsm.cloudConnector.eureka.syncToK8S.enable | bool | `true` | |
| fsm.cloudConnector.eureka.syncToK8S.filterMetadata | string | `""` | |
| fsm.cloudConnector.eureka.syncToK8S.passingOnly | bool | `true` | |
| fsm.cloudConnector.eureka.syncToK8S.prefixMetadata | string | `""` | |
| fsm.cloudConnector.eureka.syncToK8S.suffixMetadata | string | `""` | |
| fsm.cloudConnector.eureka.syncToK8S.withGatewayAPI | bool | `false` | |
| fsm.cloudConnector.nodeSelector | object | `{}` | |
| fsm.cloudConnector.podLabels | object | `{}` | Sidecar injector's pod labels |
| fsm.cloudConnector.replicaCount | int | `1` | Sidecar injector's replica count (ignored when autoscale.enable is true) |
Expand Down
28 changes: 27 additions & 1 deletion charts/fsm/templates/fsm-consul-connector-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,41 @@ spec:
"-mesh-name", "{{.Values.fsm.meshName}}",
"-trust-domain", "{{.Values.fsm.trustDomain}}",
"-derive-namespace={{.Values.fsm.cloudConnector.consul.deriveNamespace}}",
"-with-gateway-api={{.Values.fsm.fsmGateway.enabled}}",
"-sdr-provider=consul",
"-sdr-http-addr={{.Values.fsm.cloudConnector.consul.httpAddr}}",
"-sync-cloud-to-k8s={{.Values.fsm.cloudConnector.consul.syncToK8S.enable}}",
"-sync-cloud-to-k8s-passing-only={{.Values.fsm.cloudConnector.consul.syncToK8S.passingOnly}}",
"-sync-cloud-to-k8s-filter-tag={{.Values.fsm.cloudConnector.consul.syncToK8S.filterTag}}",
"-sync-cloud-to-k8s-prefix-tag={{.Values.fsm.cloudConnector.consul.syncToK8S.prefixTag}}",
"-sync-cloud-to-k8s-suffix-tag={{.Values.fsm.cloudConnector.consul.syncToK8S.suffixTag}}",
"-sync-cloud-to-k8s-with-gateway-api={{.Values.fsm.cloudConnector.consul.syncToK8S.withGatewayAPI}}",
"-sync-k8s-to-cloud={{.Values.fsm.cloudConnector.consul.syncFromK8S.enable}}",
"-sync-k8s-to-cloud-default-sync={{.Values.fsm.cloudConnector.consul.syncFromK8S.defaultSync}}",
"-sync-k8s-to-cloud-sync-cluster-ip-services={{.Values.fsm.cloudConnector.consul.syncFromK8S.syncClusterIPServices}}",
"-sync-k8s-to-cloud-sync-load-balancer-services-endpoints={{.Values.fsm.cloudConnector.consul.syncFromK8S.syncLoadBalancerEndpoints}}",
"-sync-k8s-to-cloud-node-port-sync-type={{.Values.fsm.cloudConnector.consul.syncFromK8S.nodePortSyncType}}",
"-sync-k8s-to-cloud-sync-ingress={{.Values.fsm.cloudConnector.consul.syncFromK8S.syncIngress}}",
"-sync-k8s-to-cloud-sync-ingress-load-balancer-ips={{.Values.fsm.cloudConnector.consul.syncFromK8S.syncIngressLoadBalancerIPs}}",
"-sync-k8s-to-cloud-add-service-prefix={{.Values.fsm.cloudConnector.consul.syncFromK8S.addServicePrefix}}",
"-sync-k8s-to-cloud-add-k8s-namespace-as-service-suffix={{.Values.fsm.cloudConnector.consul.syncFromK8S.addK8SNamespaceAsServiceSuffix}}",
{{- if .Values.fsm.cloudConnector.consul.syncFromK8S.allowK8sNamespaces }}
{{- range .Values.fsm.cloudConnector.consul.syncFromK8S.allowK8sNamespaces }}
"-sync-k8s-to-cloud-allow-k8s-namespaces={{ . }}",
{{- end }}
{{- end }}
{{- if .Values.fsm.cloudConnector.consul.syncFromK8S.denyK8sNamespaces }}
{{- range .Values.fsm.cloudConnector.consul.syncFromK8S.denyK8sNamespaces }}
"-sync-k8s-to-cloud-deny-k8s-namespaces={{ . }}",
{{- end }}
{{- end }}
"-sync-k8s-to-cloud-with-gateway-api={{.Values.fsm.cloudConnector.consul.syncFromK8S.withGatewayAPI}}",
"-sync-k8s-to-cloud-Consul-node-name={{.Values.fsm.cloudConnector.consul.syncFromK8S.consulNodeName}}",
"-sync-k8s-to-cloud-Consul-k8s-tag={{.Values.fsm.cloudConnector.consul.syncFromK8S.consulK8STag}}",
"-sync-k8s-to-cloud-Consul-enable-namespaces={{.Values.fsm.cloudConnector.consul.syncFromK8S.consulEnableNamespaces}}",
"-sync-k8s-to-cloud-Consul-destination-namespace={{.Values.fsm.cloudConnector.consul.syncFromK8S.consulDestinationNamespace}}",
"-sync-k8s-to-cloud-Consul-enable-k8s-namespace-mirroring={{.Values.fsm.cloudConnector.consul.syncFromK8S.consulEnableK8SNSMirroring}}",
"-sync-k8s-to-cloud-Consul-k8s-namespace-mirroring-prefix={{.Values.fsm.cloudConnector.consul.syncFromK8S.consulK8SNSMirroringPrefix}}",
"-sync-k8s-to-cloud-Consul-cross-namespace-acl-policy={{.Values.fsm.cloudConnector.consul.syncFromK8S.consulCrossNamespaceACLPolicy}}",
]
resources:
limits:
Expand Down
21 changes: 20 additions & 1 deletion charts/fsm/templates/fsm-eureka-connector-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,34 @@ spec:
"-mesh-name", "{{.Values.fsm.meshName}}",
"-trust-domain", "{{.Values.fsm.trustDomain}}",
"-derive-namespace={{.Values.fsm.cloudConnector.eureka.deriveNamespace}}",
"-with-gateway-api={{.Values.fsm.fsmGateway.enabled}}",
"-sdr-provider=eureka",
"-sdr-http-addr={{.Values.fsm.cloudConnector.eureka.httpAddr}}",
"-sync-cloud-to-k8s={{.Values.fsm.cloudConnector.eureka.syncToK8S.enable}}",
"-sync-cloud-to-k8s-passing-only={{.Values.fsm.cloudConnector.eureka.syncToK8S.passingOnly}}",
"-sync-cloud-to-k8s-filter-tag={{.Values.fsm.cloudConnector.eureka.syncToK8S.filterMetadata}}",
"-sync-cloud-to-k8s-prefix-tag={{.Values.fsm.cloudConnector.eureka.syncToK8S.prefixMetadata}}",
"-sync-cloud-to-k8s-suffix-tag={{.Values.fsm.cloudConnector.eureka.syncToK8S.suffixMetadata}}",
"-sync-cloud-to-k8s-with-gateway-api={{.Values.fsm.cloudConnector.eureka.syncToK8S.withGatewayAPI}}",
"-sync-k8s-to-cloud={{.Values.fsm.cloudConnector.eureka.syncFromK8S.enable}}",
"-sync-k8s-to-cloud-default-sync={{.Values.fsm.cloudConnector.eureka.syncFromK8S.defaultSync}}",
"-sync-k8s-to-cloud-sync-cluster-ip-services={{.Values.fsm.cloudConnector.eureka.syncFromK8S.syncClusterIPServices}}",
"-sync-k8s-to-cloud-sync-load-balancer-services-endpoints={{.Values.fsm.cloudConnector.eureka.syncFromK8S.syncLoadBalancerEndpoints}}",
"-sync-k8s-to-cloud-node-port-sync-type={{.Values.fsm.cloudConnector.eureka.syncFromK8S.nodePortSyncType}}",
"-sync-k8s-to-cloud-sync-ingress={{.Values.fsm.cloudConnector.eureka.syncFromK8S.syncIngress}}",
"-sync-k8s-to-cloud-sync-ingress-load-balancer-ips={{.Values.fsm.cloudConnector.eureka.syncFromK8S.syncIngressLoadBalancerIPs}}",
"-sync-k8s-to-cloud-add-service-prefix={{.Values.fsm.cloudConnector.eureka.syncFromK8S.addServicePrefix}}",
"-sync-k8s-to-cloud-add-k8s-namespace-as-service-suffix={{.Values.fsm.cloudConnector.eureka.syncFromK8S.addK8SNamespaceAsServiceSuffix}}",
{{- if .Values.fsm.cloudConnector.eureka.syncFromK8S.allowK8sNamespaces }}
{{- range .Values.fsm.cloudConnector.eureka.syncFromK8S.allowK8sNamespaces }}
"-sync-k8s-to-cloud-allow-k8s-namespaces={{ . }}",
{{- end }}
{{- end }}
{{- if .Values.fsm.cloudConnector.eureka.syncFromK8S.denyK8sNamespaces }}
{{- range .Values.fsm.cloudConnector.eureka.syncFromK8S.denyK8sNamespaces }}
"-sync-k8s-to-cloud-deny-k8s-namespaces={{ . }}",
{{- end }}
{{- end }}
"-sync-k8s-to-cloud-with-gateway-api={{.Values.fsm.cloudConnector.eureka.syncFromK8S.withGatewayAPI}}",
]
resources:
limits:
Expand Down
Loading