admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix kubesphere gateway bug

Browse Source
This commit is contained in:
Jeff
2019-09-19 14:00:52 +08:00
committed by zryfish
parent 3fc4207585
commit 49dacd3e70
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
install/ingress-controller/ingress-controller.yaml
View File

@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: ks-router name: ks-router
@@ -26,7 +26,6 @@ spec:
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
- --configmap=$(POD_NAMESPACE)/nginx-configuration
- --annotations-prefix=nginx.ingress.kubernetes.io - --annotations-prefix=nginx.ingress.kubernetes.io
- --force-namespace-isolation - --force-namespace-isolation
- --update-status - --update-status

9
pkg/models/routers/routers.go
View File

@@ -348,6 +348,9 @@ func createOrUpdateRouterWorkload(namespace string, publishService bool, service
deployment.Spec.Selector.MatchLabels["project"] = namespace deployment.Spec.Selector.MatchLabels["project"] = namespace
deployment.Spec.Template.Labels["project"] = namespace deployment.Spec.Template.Labels["project"] = namespace
// Add configmap
deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--configmap=$(POD_NAMESPACE)/"+deployment.Name)
// Isolate namespace // Isolate namespace
deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--watch-namespace="+namespace) deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--watch-namespace="+namespace)
@@ -362,8 +365,10 @@ func createOrUpdateRouterWorkload(namespace string, publishService bool, service
if deployment.Spec.Template.Spec.Containers[i].Name == "nginx-ingress-controller" { if deployment.Spec.Template.Spec.Containers[i].Name == "nginx-ingress-controller" {
var args []string var args []string
for j := range deployment.Spec.Template.Spec.Containers[i].Args { for j := range deployment.Spec.Template.Spec.Containers[i].Args {
if strings.HasPrefix("--publish-service", deployment.Spec.Template.Spec.Containers[i].Args[j]) || argument := deployment.Spec.Template.Spec.Containers[i].Args[j]
strings.HasPrefix("--report-node-internal-ip-address", deployment.Spec.Template.Spec.Containers[i].Args[j]) { if strings.HasPrefix("--publish-service", argument) ||
strings.HasPrefix("--configmap", argument) ||
strings.HasPrefix("--report-node-internal-ip-address", argument) {
continue continue
} }
args = append(args, deployment.Spec.Template.Spec.Containers[i].Args[j]) args = append(args, deployment.Spec.Template.Spec.Containers[i].Args[j])