add serializeable start config #1247
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| package api | ||
|
|
||
| import ( | ||
| "crypto/x509" | ||
| "fmt" | ||
| "io/ioutil" | ||
|
|
||
| kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client" | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" | ||
|
|
||
| "github.com/openshift/origin/pkg/client" | ||
| "github.com/openshift/origin/pkg/cmd/server/crypto" | ||
| ) | ||
|
|
||
| func GetKubeClient(kubeConfigFile string) (*kclient.Client, *kclient.Config, error) { | ||
| loadingRules := &clientcmd.ClientConfigLoadingRules{CommandLinePath: kubeConfigFile} | ||
| loader := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, &clientcmd.ConfigOverrides{}) | ||
|
|
||
| kubeConfig, err := loader.ClientConfig() | ||
| if err != nil { | ||
| return nil, nil, err | ||
| } | ||
| kubeClient, err := kclient.New(kubeConfig) | ||
| if err != nil { | ||
| return nil, nil, err | ||
| } | ||
|
|
||
| return kubeClient, kubeConfig, nil | ||
| } | ||
|
|
||
| func GetOpenShiftClient(kubeConfigFile string) (*client.Client, *kclient.Config, error) { | ||
| loadingRules := &clientcmd.ClientConfigLoadingRules{CommandLinePath: kubeConfigFile} | ||
| loader := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, &clientcmd.ConfigOverrides{}) | ||
|
|
||
| kubeConfig, err := loader.ClientConfig() | ||
| if err != nil { | ||
| return nil, nil, err | ||
| } | ||
| openshiftClient, err := client.New(kubeConfig) | ||
| if err != nil { | ||
| return nil, nil, err | ||
| } | ||
|
|
||
| return openshiftClient, kubeConfig, nil | ||
| } | ||
|
|
||
| func UseTLS(servingInfo ServingInfo) bool { | ||
| return len(servingInfo.ServerCert.CertFile) > 0 | ||
| } | ||
|
|
||
| // GetAPIClientCertCAPool returns the cert pool used to validate client certificates to the API server | ||
| func GetAPIClientCertCAPool(options MasterConfig) (*x509.CertPool, error) { | ||
| certs, err := getAPIClientCertCAs(options) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| roots := x509.NewCertPool() | ||
| for _, root := range certs { | ||
| roots.AddCert(root) | ||
| } | ||
| return roots, nil | ||
| } | ||
|
|
||
| // GetClientCertCAPool returns a cert pool containing all client CAs that could be presented (union of API and OAuth) | ||
| func GetClientCertCAPool(options MasterConfig) (*x509.CertPool, error) { | ||
| roots := x509.NewCertPool() | ||
|
|
||
| // Add CAs for OAuth | ||
| certs, err := getOAuthClientCertCAs(options) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| for _, root := range certs { | ||
| roots.AddCert(root) | ||
| } | ||
|
|
||
| // Add CAs for API | ||
| certs, err = getAPIClientCertCAs(options) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| for _, root := range certs { | ||
| roots.AddCert(root) | ||
| } | ||
|
|
||
| return roots, nil | ||
| } | ||
|
|
||
| // GetAPIServerCertCAPool returns the cert pool containing the roots for the API server cert | ||
| func GetAPIServerCertCAPool(options MasterConfig) (*x509.CertPool, error) { | ||
| caRoots, err := crypto.GetTLSCARoots(options.ServingInfo.ClientCA) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| roots := x509.NewCertPool() | ||
| for _, root := range caRoots.Roots { | ||
| roots.AddCert(root) | ||
| } | ||
| return roots, nil | ||
| } | ||
|
|
||
| func getOAuthClientCertCAs(options MasterConfig) ([]*x509.Certificate, error) { | ||
| caFile := options.OAuthConfig.ProxyCA | ||
| if len(caFile) == 0 { | ||
| return nil, nil | ||
| } | ||
| caPEMBlock, err := ioutil.ReadFile(caFile) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| certs, err := crypto.CertsFromPEM(caPEMBlock) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("Error reading %s: %s", caFile, err) | ||
| } | ||
| return certs, nil | ||
| } | ||
|
|
||
| func getAPIClientCertCAs(options MasterConfig) ([]*x509.Certificate, error) { | ||
| apiClientCertCAs, err := crypto.GetTLSCARoots(options.ServingInfo.ClientCA) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return apiClientCertCAs.Roots, nil | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package latest | ||
|
|
||
| import ( | ||
| "github.com/openshift/origin/pkg/cmd/server/api/v1" | ||
| ) | ||
|
|
||
| // Version is the string that represents the current external default version. | ||
| const Version = "v1" | ||
|
|
||
| // OldestVersion is the string that represents the oldest server version supported, | ||
| // for client code that wants to hardcode the lowest common denominator. | ||
| const OldestVersion = "v1" | ||
|
|
||
| // Versions is the list of versions that are recognized in code. The order provided | ||
| // may be assumed to be least feature rich to most feature rich, and clients may | ||
| // choose to prefer the latter items in the list over the former items when presented | ||
| // with a set of versions to choose. | ||
| var Versions = []string{"v1"} | ||
|
|
||
| // Codec is the default codec for serializing output that should use | ||
| // the latest supported version. Use this Codec when writing to | ||
| // disk, a data store that is not dynamically versioned, or in tests. | ||
| // This codec can decode any object that Kubernetes is aware of. | ||
| var Codec = v1.Codec |
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 |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package api | ||
|
|
||
| import ( | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" | ||
| ) | ||
|
|
||
| var Scheme = runtime.NewScheme() | ||
|
|
||
| func init() { | ||
| Scheme.AddKnownTypes("", | ||
| &MasterConfig{}, | ||
| &NodeConfig{}, | ||
| ) | ||
| } | ||
|
|
||
| func (*MasterConfig) IsAnAPIObject() {} | ||
| func (*NodeConfig) IsAnAPIObject() {} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know this is end-to-end, and we're making assumptions, but technically, the trusted root bundle for the master is what we really want... there's no guarantee the CA signing cert (if we have one) was used to generate the server cert.