Skip to content

MCS: change machine-config-server ports #368

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

Merged
openshift-merge-robot merged 1 commit into from
Feb 7, 2019
Merged

MCS: change machine-config-server ports #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions cmd/machine-config-server/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ import (
"github.com/spf13/cobra"
)

const (
// we are transitioning from legacy ports 49500/49501 -> 22623/22624
// this can be removed once fully transitioned in the installer.
legacySecurePort = 49500
legacyInsecurePort = 49501
)

var (
bootstrapCmd = &cobra.Command{
Use: "bootstrap",
Expand Down Expand Up @@ -45,10 +52,14 @@ func runBootstrapCmd(cmd *cobra.Command, args []string) {
apiHandler := server.NewServerAPIHandler(bs)
secureServer := server.NewAPIServer(apiHandler, rootOpts.sport, false, rootOpts.cert, rootOpts.key)
insecureServer := server.NewAPIServer(apiHandler, rootOpts.isport, true, "", "")
legacySecureServer := server.NewAPIServer(apiHandler, legacySecurePort, false, rootOpts.cert, rootOpts.key)
legacyInsecureServer := server.NewAPIServer(apiHandler, legacyInsecurePort, true, "", "")

stopCh := make(chan struct{})
go secureServer.Serve()
go insecureServer.Serve()
go legacySecureServer.Serve()
go legacyInsecureServer.Serve()
<-stopCh
panic("not possible")
}
4 changes: 2 additions & 2 deletions cmd/machine-config-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ var (

func init() {
rootCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
rootCmd.PersistentFlags().IntVar(&rootOpts.sport, "secure-port", 49500, "secure port to serve ignition configs")
rootCmd.PersistentFlags().IntVar(&rootOpts.sport, "secure-port", 22623, "secure port to serve ignition configs")
rootCmd.PersistentFlags().StringVar(&rootOpts.cert, "cert", "/etc/ssl/mcs/tls.crt", "cert file for TLS")
rootCmd.PersistentFlags().StringVar(&rootOpts.key, "key", "/etc/ssl/mcs/tls.key", "key file for TLS")
rootCmd.PersistentFlags().IntVar(&rootOpts.isport, "insecure-port", 49501, "insecure port to serve ignition configs")
rootCmd.PersistentFlags().IntVar(&rootOpts.isport, "insecure-port", 22624, "insecure port to serve ignition configs")
}

func main() {
Expand Down
6 changes: 6 additions & 0 deletions cmd/machine-config-server/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,19 @@ func runStartCmd(cmd *cobra.Command, args []string) {
glog.Exitf("Machine Config Server exited with error: %v", err)
}

// we are transitioning from legacy ports 49500/49501 -> 22623/22624
// legacySecureServer/legacyInsecureServer will be removed once the installer commits port changes.
apiHandler := server.NewServerAPIHandler(cs)
secureServer := server.NewAPIServer(apiHandler, rootOpts.sport, false, rootOpts.cert, rootOpts.key)
insecureServer := server.NewAPIServer(apiHandler, rootOpts.isport, true, "", "")
legacySecureServer := server.NewAPIServer(apiHandler, legacySecurePort, false, rootOpts.cert, rootOpts.key)
legacyInsecureServer := server.NewAPIServer(apiHandler, legacyInsecurePort, true, "", "")

stopCh := make(chan struct{})
go secureServer.Serve()
go insecureServer.Serve()
go legacySecureServer.Serve()
go legacyInsecureServer.Serve()
<-stopCh
panic("not possible")
}