diff --git a/cmd/webhook-manager/app/options/options.go b/cmd/webhook-manager/app/options/options.go index 2bc9b2fe9d..78eb3ee41f 100644 --- a/cmd/webhook-manager/app/options/options.go +++ b/cmd/webhook-manager/app/options/options.go @@ -58,7 +58,7 @@ func (c *Config) AddFlags(fs *pflag.FlagSet) { "File containing the default x509 Certificate for HTTPS. (CA cert, if any, concatenated "+ "after server cert).") fs.StringVar(&c.KeyFile, "tls-private-key-file", c.KeyFile, "File containing the default x509 private key matching --tls-cert-file.") - fs.IntVar(&c.Port, "port", 443, "the port used by admission-controller-server.") + fs.IntVar(&c.Port, "port", 8443, "the port used by admission-controller-server.") fs.BoolVar(&c.PrintVersion, "version", false, "Show version and quit") fs.Float32Var(&c.KubeClientOptions.QPS, "kube-api-qps", defaultQPS, "QPS to use while talking with kubernetes apiserver") fs.IntVar(&c.KubeClientOptions.Burst, "kube-api-burst", defaultBurst, "Burst to use while talking with kubernetes apiserver") diff --git a/installer/helm/chart/volcano/templates/admission.yaml b/installer/helm/chart/volcano/templates/admission.yaml index 90a359b341..58141764ba 100644 --- a/installer/helm/chart/volcano/templates/admission.yaml +++ b/installer/helm/chart/volcano/templates/admission.yaml @@ -80,7 +80,7 @@ spec: - --webhook-namespace={{ .Release.Namespace }} - --webhook-service-name={{ .Release.Name }}-admission-service - --logtostderr - - --port=443 + - --port={{.Values.basic.admission_port}} - -v=4 - 2>&1 image: {{.Values.basic.admission_image_name}}:{{.Values.basic.image_tag_version}} @@ -108,7 +108,7 @@ spec: ports: - port: 443 protocol: TCP - targetPort: 443 + targetPort: {{.Values.basic.admission_port}} selector: app: volcano-admission sessionAffinity: None diff --git a/installer/helm/chart/volcano/values.yaml b/installer/helm/chart/volcano/values.yaml index c9784e5996..fdeff9174c 100644 --- a/installer/helm/chart/volcano/values.yaml +++ b/installer/helm/chart/volcano/values.yaml @@ -6,3 +6,4 @@ basic: admission_secret_name: "volcano-admission-secret" scheduler_config_file: "config/volcano-scheduler.conf" image_pull_secret: "" + admission_port: 8443 diff --git a/installer/volcano-development.yaml b/installer/volcano-development.yaml index 4f1d433372..a030715211 100644 --- a/installer/volcano-development.yaml +++ b/installer/volcano-development.yaml @@ -217,7 +217,7 @@ spec: - --webhook-namespace=volcano-system - --webhook-service-name=volcano-admission-service - --logtostderr - - --port=443 + - --port=8443 - -v=4 - 2>&1 image: volcanosh/vc-webhook-manager:latest @@ -245,7 +245,7 @@ spec: ports: - port: 443 protocol: TCP - targetPort: 443 + targetPort: 8443 selector: app: volcano-admission sessionAffinity: None