feat: Configuring TLS options from Central TLS Profile #1184
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ limitations under the License. | |
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "crypto/tls" | ||
| "flag" | ||
| "fmt" | ||
|
|
@@ -64,6 +65,7 @@ import ( | |
| "sigs.k8s.io/controller-runtime/pkg/manager" | ||
| "sigs.k8s.io/controller-runtime/pkg/webhook" | ||
|
|
||
| tlspkg "github.com/openshift/controller-runtime-common/pkg/tls" | ||
| pipelinesv1alpha1 "github.com/redhat-developer/gitops-operator/api/v1alpha1" | ||
| "github.com/redhat-developer/gitops-operator/common" | ||
| "github.com/redhat-developer/gitops-operator/controllers" | ||
|
|
@@ -94,6 +96,7 @@ func main() { | |
|
|
||
| var enableHTTP2 = false | ||
| var skipControllerNameValidation = true | ||
| var disableClusterTLSProfile = false | ||
|
|
||
| var labelSelectorFlag string | ||
| flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.") | ||
|
|
@@ -103,7 +106,7 @@ func main() { | |
| "Enable leader election for controller manager. "+ | ||
| "Enabling this will ensure there is only one active controller manager.") | ||
| flag.BoolVar(&enableHTTP2, "enable-http2", enableHTTP2, "If HTTP/2 should be enabled for the metrics and webhook servers.") | ||
| flag.BoolVar(&disableClusterTLSProfile, "disable-cluster-tls-profile", false, "Disable use of the cluster TLS security profile") | ||
| //Configure log level | ||
| logLevelStr := strings.ToLower(os.Getenv("LOG_LEVEL")) | ||
| logLevel := zapcore.InfoLevel | ||
|
|
@@ -129,9 +132,12 @@ func main() { | |
| } | ||
| opts.BindFlags(flag.CommandLine) | ||
| flag.Parse() | ||
| if strings.EqualFold(os.Getenv("DISABLE_CLUSTER_TLS_PROFILE"), "true") { | ||
| disableClusterTLSProfile = true | ||
| } | ||
| ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) | ||
| ctx, cancel := context.WithCancel(ctrl.SetupSignalHandler()) | ||
| defer cancel() | ||
| if err := util.InspectCluster(); err != nil { | ||
| setupLog.Error(err, "unable to inspect cluster") | ||
| } | ||
|
|
@@ -142,15 +148,40 @@ func main() { | |
| } | ||
| c.NextProtos = []string{"http/1.1"} | ||
| } | ||
| var profile configv1.TLSProfileSpec | ||
| var err error | ||
| tlsOpts := []func(*tls.Config){disableHTTP2} | ||
| if util.IsConfigAPIFound() && !disableClusterTLSProfile { | ||
| utilruntime.Must(configv1.Install(scheme)) | ||
| bootstrapClient, err := crclient.New(ctrl.GetConfigOrDie(), crclient.Options{ | ||
| Scheme: scheme, | ||
| }) | ||
| if err != nil { | ||
| setupLog.Error(err, "unable to create bootstrap client") | ||
| os.Exit(1) | ||
| } | ||
| profile, err = tlspkg.FetchAPIServerTLSProfile(ctx, bootstrapClient) | ||
| if err != nil { | ||
| setupLog.Error(err, "unable to fetch cluster TLS profile") | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| tlsConfigFn, unsupported := tlspkg.NewTLSConfigFromProfile(profile) | ||
| if len(unsupported) > 0 { | ||
| setupLog.Info("TLS profile contains unsupported Go cipher suites", "ciphers", unsupported) | ||
| } | ||
|
|
||
| tlsOpts = append(tlsOpts, tlsConfigFn) | ||
| } | ||
| webhookServerOptions := webhook.Options{ | ||
| TLSOpts: tlsOpts, | ||
| Port: 9443, | ||
| } | ||
| webhookServer := webhook.NewServer(webhookServerOptions) | ||
|
|
||
| metricsServerOptions := metricsserver.Options{ | ||
| BindAddress: metricsAddr, | ||
| TLSOpts: tlsOpts, | ||
| FilterProvider: filters.WithAuthenticationAndAuthorization, | ||
| } | ||
|
|
||
|
|
@@ -198,6 +229,27 @@ func main() { | |
| client = mgr.GetClient() | ||
| } | ||
|
|
||
| if util.IsConfigAPIFound() && !disableClusterTLSProfile { | ||
| watcher := &tlspkg.SecurityProfileWatcher{ | ||
| Client: mgr.GetClient(), | ||
| InitialTLSProfileSpec: profile, | ||
| OnProfileChange: func(_ context.Context, oldProfile, newProfile configv1.TLSProfileSpec) { | ||
| if reflect.DeepEqual(oldProfile, newProfile) { | ||
| return | ||
| } | ||
| setupLog.Info( | ||
| "cluster TLS profile changed, restarting operator", | ||
| "oldProfileMinVersion", oldProfile.MinTLSVersion, | ||
| "newProfileMinVersion", newProfile.MinTLSVersion, | ||
| ) | ||
| cancel() | ||
| }, | ||
| } | ||
| if err := watcher.SetupWithManager(mgr); err != nil { | ||
| setupLog.Error(err, "unable to setup TLS security profile watcher") | ||
| os.Exit(1) | ||
| } | ||
| } | ||
| // Setup Scheme for OpenShift Console if available (verified by InspectCluster) | ||
| if util.IsConsoleAPIFound() { | ||
| registerComponentOrExit(mgr, console.AddToScheme) | ||
|
|
@@ -314,6 +366,11 @@ func main() { | |
| K8sClient: k8sClient, | ||
| LocalUsers: argocdprovisioner.NewLocalUsersInfo(), | ||
| FipsConfigChecker: argoutil.NewLinuxFipsConfigChecker(), | ||
| CentralTLSConfigProfile: argocdprovisioner.TLSConfigProfile{ | ||
| DisableClusterTLSProfile: disableClusterTLSProfile, | ||
| MinVersion: profile.MinTLSVersion, | ||
| Ciphers: profile.Ciphers, | ||
| }, | ||
| }).SetupWithManager(mgr); err != nil { | ||
| setupLog.Error(err, "unable to create controller", "controller", "Argo CD") | ||
| os.Exit(1) | ||
|
|
@@ -362,7 +419,7 @@ func main() { | |
| } | ||
|
|
||
| setupLog.Info("starting manager") | ||
| if err := mgr.Start(ctx); err != nil { | ||
|
Member
Author
There was a problem hiding this comment. this change is required for controlling the controller runtime. example reference from https://docs.google.com/document/d/1cMc9E8psHfnoK06ntR8kHSWB8d3rMtmldhnmM4nImjs/edit?tab=t.4cxmujrb3zyn#heading=h.111788dqn5nc In main: get initial profile, create manager (with TLSOpts if you have a TLS metrics server), create context with cancel, call setupTLSProfileWatcher(ctx, mgr, cancel), then mgr.Start(ctx). When the cluster profile changes, OnProfileChange runs; typically you cancel the context so the process exits and restarts with the new profile (e.g. under a pod restart). |
||
| setupLog.Error(err, "problem running manager") | ||
| os.Exit(1) | ||
| } | ||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.