-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Expand file tree
/
Copy pathlegacyconfig_conversion.go
More file actions
148 lines (122 loc) · 5.07 KB
/
Copy pathlegacyconfig_conversion.go
File metadata and controls
148 lines (122 loc) · 5.07 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
package configconversion
import (
"net"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
configv1 "github.com/openshift/api/config/v1"
kubecontrolplanev1 "github.com/openshift/api/kubecontrolplane/v1"
legacyconfigv1 "github.com/openshift/api/legacyconfig/v1"
externaliprangerv1 "github.com/openshift/origin/pkg/service/admission/apis/externalipranger/v1"
restrictedendpointsv1 "github.com/openshift/origin/pkg/service/admission/apis/restrictedendpoints/v1"
)
func convertNetworkConfigToAdmissionConfig(masterConfig *legacyconfigv1.MasterConfig) error {
if masterConfig.AdmissionConfig.PluginConfig == nil {
masterConfig.AdmissionConfig.PluginConfig = map[string]*legacyconfigv1.AdmissionPluginConfig{}
}
scheme := runtime.NewScheme()
utilruntime.Must(externaliprangerv1.InstallLegacy(scheme))
utilruntime.Must(restrictedendpointsv1.InstallLegacy(scheme))
codecs := serializer.NewCodecFactory(scheme)
encoder := codecs.LegacyCodec(externaliprangerv1.SchemeGroupVersion, restrictedendpointsv1.SchemeGroupVersion)
// convert the networkconfig to admissionconfig
var restricted []string
restricted = append(restricted, masterConfig.NetworkConfig.ServiceNetworkCIDR)
for _, cidr := range masterConfig.NetworkConfig.ClusterNetworks {
restricted = append(restricted, cidr.CIDR)
}
restrictedEndpointConfig := &restrictedendpointsv1.RestrictedEndpointsAdmissionConfig{
RestrictedCIDRs: restricted,
}
restrictedEndpointConfigContent, err := runtime.Encode(encoder, restrictedEndpointConfig)
if err != nil {
return err
}
masterConfig.AdmissionConfig.PluginConfig["openshift.io/RestrictedEndpointsAdmission"] = &legacyconfigv1.AdmissionPluginConfig{
Configuration: runtime.RawExtension{Raw: restrictedEndpointConfigContent},
}
allowIngressIP := false
if _, ipNet, err := net.ParseCIDR(masterConfig.NetworkConfig.IngressIPNetworkCIDR); err == nil && !ipNet.IP.IsUnspecified() {
allowIngressIP = true
}
externalIPRangerAdmissionConfig := &externaliprangerv1.ExternalIPRangerAdmissionConfig{
ExternalIPNetworkCIDRs: masterConfig.NetworkConfig.ExternalIPNetworkCIDRs,
AllowIngressIP: allowIngressIP,
}
externalIPRangerAdmissionConfigContent, err := runtime.Encode(encoder, externalIPRangerAdmissionConfig)
if err != nil {
return err
}
masterConfig.AdmissionConfig.PluginConfig["ExternalIPRanger"] = &legacyconfigv1.AdmissionPluginConfig{
Configuration: runtime.RawExtension{Raw: externalIPRangerAdmissionConfigContent},
}
return nil
}
// ConvertMasterConfigToKubeAPIServerConfig mutates it's input. This is acceptable because we do not need it by the time we get to 4.0.
func ConvertMasterConfigToKubeAPIServerConfig(input *legacyconfigv1.MasterConfig) (*kubecontrolplanev1.KubeAPIServerConfig, error) {
if err := convertNetworkConfigToAdmissionConfig(input); err != nil {
return nil, err
}
var err error
ret := &kubecontrolplanev1.KubeAPIServerConfig{
GenericAPIServerConfig: configv1.GenericAPIServerConfig{
CORSAllowedOrigins: input.CORSAllowedOrigins,
StorageConfig: configv1.EtcdStorageConfig{
StoragePrefix: input.EtcdStorageConfig.OpenShiftStoragePrefix,
},
},
ServicesSubnet: input.KubernetesMasterConfig.ServicesSubnet,
ServicesNodePortRange: input.KubernetesMasterConfig.ServicesNodePortRange,
ImagePolicyConfig: kubecontrolplanev1.KubeAPIServerImagePolicyConfig{
InternalRegistryHostname: input.ImagePolicyConfig.InternalRegistryHostname,
ExternalRegistryHostname: input.ImagePolicyConfig.ExternalRegistryHostname,
},
ProjectConfig: kubecontrolplanev1.KubeAPIServerProjectConfig{
DefaultNodeSelector: input.ProjectConfig.DefaultNodeSelector,
},
ServiceAccountPublicKeyFiles: input.ServiceAccountConfig.PublicKeyFiles,
// TODO this needs to be removed.
APIServerArguments: map[string]kubecontrolplanev1.Arguments{},
}
for k, v := range input.KubernetesMasterConfig.APIServerArguments {
ret.APIServerArguments[k] = v
}
// TODO this is likely to be a little weird. I think we override most of this in the operator
ret.ServingInfo, err = ToHTTPServingInfo(&input.ServingInfo)
if err != nil {
return nil, err
}
ret.OAuthConfig, err = ToOAuthConfig(input.OAuthConfig)
if err != nil {
return nil, err
}
ret.AuthConfig, err = ToMasterAuthConfig(&input.AuthConfig)
if err != nil {
return nil, err
}
ret.AggregatorConfig, err = ToAggregatorConfig(&input.AggregatorConfig)
if err != nil {
return nil, err
}
ret.AuditConfig, err = ToAuditConfig(&input.AuditConfig)
if err != nil {
return nil, err
}
ret.StorageConfig.EtcdConnectionInfo, err = ToEtcdConnectionInfo(&input.EtcdClientInfo)
if err != nil {
return nil, err
}
ret.KubeletClientInfo, err = ToKubeletConnectionInfo(&input.KubeletClientInfo)
if err != nil {
return nil, err
}
ret.AdmissionPluginConfig, err = ToAdmissionPluginConfigMap(input.AdmissionConfig.PluginConfig)
if err != nil {
return nil, err
}
ret.UserAgentMatchingConfig, err = ToUserAgentMatchingConfig(&input.PolicyConfig.UserAgentMatchingConfig)
if err != nil {
return nil, err
}
return ret, nil
}