Skip to content

Commit 6e4bb42

Browse files
jhadvigjhadvig
committed
OCPBUGS-74506: Remove CSP feature flag
1 parent cfd48a0 commit 6e4bb42

8 files changed

Lines changed: 82 additions & 107 deletions

File tree

‎pkg/console/operator/operator.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@ type consoleOperator struct {
8989
// lister
9090
consolePluginLister listerv1.ConsolePluginLister
9191

92-
// CSP feature gate enabled
93-
contentSecurityPolicyEnabled bool
94-
9592
resourceSyncer resourcesynccontroller.ResourceSyncer
9693

9794
trackables trackables
@@ -110,7 +107,6 @@ type trackables struct {
110107

111108
func NewConsoleOperator(
112109
ctx context.Context,
113-
contentSecurityPolicyEnabled bool,
114110
// top level config
115111
configClient configclientv1.ConfigV1Interface,
116112
configInformer configinformer.SharedInformerFactory,
@@ -192,8 +188,7 @@ func NewConsoleOperator(
192188
consolePluginLister: consolePluginInformer.Lister(),
193189
resourceSyncer: resourceSyncer,
194190

195-
monitoringDeploymentLister: monitoringDeploymentInformer.Lister(),
196-
contentSecurityPolicyEnabled: contentSecurityPolicyEnabled,
191+
monitoringDeploymentLister: monitoringDeploymentInformer.Lister(),
197192
}
198193

199194
informers := []factory.Informer{

‎pkg/console/operator/sync_v400.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,6 @@ func (co *consoleOperator) SyncConfigMap(
397397
nodeArchitectures,
398398
nodeOperatingSystems,
399399
copiedCSVsDisabled,
400-
co.contentSecurityPolicyEnabled,
401400
telemetryConfig,
402401
consoleHost,
403402
techPreviewEnabled,

‎pkg/console/starter/starter.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,9 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
235235
return err
236236
}
237237

238-
contentSecurityPolicyEnabled := featureGates.Enabled("ConsolePluginContentSecurityPolicy")
239238
// TODO: rearrange these into informer,client pairs, NOT separated.
240239
consoleOperator := consoleoperator.NewConsoleOperator(
241240
ctx,
242-
contentSecurityPolicyEnabled,
243241
// top level config
244242
configClient.ConfigV1(),
245243
configInformers,

‎pkg/console/subresource/configmap/configmap.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ func DefaultConfigMap(
4646
nodeArchitectures []string,
4747
nodeOperatingSystems []string,
4848
copiedCSVsDisabled bool,
49-
contentSecurityPolicyEnabled bool,
5049
telemeterConfig map[string]string,
5150
consoleHost string,
5251
techPreviewEnabled bool,
@@ -89,7 +88,6 @@ func DefaultConfigMap(
8988
PluginsOrder(availablePlugins, operatorConfig).
9089
I18nNamespaces(pluginsWithI18nNamespace(availablePlugins)).
9190
ContentSecurityPolicies(aggregateCSPDirectives(availablePlugins)).
92-
ContentSecurityPolicyEnabled(contentSecurityPolicyEnabled).
9391
Proxy(getPluginsProxyServices(availablePlugins)).
9492
CustomLogoFile(operatorConfig.Spec.Customization.CustomLogoFile). // TODO Remove deprecated CustomLogoFile API.
9593
CustomLogos(operatorConfig.Spec.Customization.Logos).

‎pkg/console/subresource/configmap/configmap_test.go‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,20 @@ nV5cXbp9W1bC12Tc8nnNXn4ypLE2JTQAvyp51zoZ8hQoSnRVx/VCY55Yu+br8gQZ
5151
// To manually run these tests: go test -v ./pkg/console/subresource/configmap/...
5252
func TestDefaultConfigMap(t *testing.T) {
5353
type args struct {
54-
operatorConfig *operatorv1.Console
55-
authConfig *configv1.Authentication
56-
consoleConfig *configv1.Console
57-
managedConfig *corev1.ConfigMap
58-
monitoringSharedConfig *corev1.ConfigMap
59-
authServerCAConfig *corev1.ConfigMap
60-
infrastructureConfig *configv1.Infrastructure
61-
rt *routev1.Route
62-
inactivityTimeoutSeconds int
63-
availablePlugins []*consolev1.ConsolePlugin
64-
nodeArchitectures []string
65-
nodeOperatingSystems []string
66-
copiedCSVsDisabled bool
67-
contentSecurityPolicyEnabled bool
68-
telemetryConfig map[string]string
54+
operatorConfig *operatorv1.Console
55+
authConfig *configv1.Authentication
56+
consoleConfig *configv1.Console
57+
managedConfig *corev1.ConfigMap
58+
monitoringSharedConfig *corev1.ConfigMap
59+
authServerCAConfig *corev1.ConfigMap
60+
infrastructureConfig *configv1.Infrastructure
61+
rt *routev1.Route
62+
inactivityTimeoutSeconds int
63+
availablePlugins []*consolev1.ConsolePlugin
64+
nodeArchitectures []string
65+
nodeOperatingSystems []string
66+
copiedCSVsDisabled bool
67+
telemetryConfig map[string]string
6968
}
7069
t.Setenv("OPERATOR_IMAGE_VERSION", testReleaseVersion)
7170
tests := []struct {
@@ -1303,7 +1302,6 @@ providers: {}
13031302
tt.args.nodeArchitectures,
13041303
tt.args.nodeOperatingSystems,
13051304
tt.args.copiedCSVsDisabled,
1306-
tt.args.contentSecurityPolicyEnabled,
13071305
tt.args.telemetryConfig,
13081306
tt.args.rt.Spec.Host,
13091307
false, // techPreviewEnabled - default to false for tests

‎pkg/console/subresource/configmap/tech_preview_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ func TestTechPreviewEnabled(t *testing.T) {
9494
[]string{"amd64"}, // nodeArchitectures
9595
[]string{"linux"}, // nodeOperatingSystems
9696
false, // copiedCSVsDisabled
97-
false, // contentSecurityPolicyEnabled
9897
map[string]string{}, // telemetryConfig
9998
"console.test.cluster", // consoleHost
10099
tt.args.techPreviewEnabled,

‎pkg/console/subresource/consoleserver/config_builder.go‎

Lines changed: 52 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -46,44 +46,43 @@ var SupportedLightspeedArchitectures = []string{"amd64"}
4646
//
4747
// b.Host().Brand("").Config()
4848
type ConsoleServerCLIConfigBuilder struct {
49-
host string
50-
logoutRedirectURL string
51-
brand operatorv1.Brand
52-
docURL string
53-
apiServerURL string
54-
controlPlaneToplogy configv1.TopologyMode
55-
statusPageID string
56-
customProductName string
57-
devCatalogCustomization operatorv1.DeveloperConsoleCatalogCustomization
58-
projectAccess operatorv1.ProjectAccess
59-
quickStarts operatorv1.QuickStarts
60-
addPage operatorv1.AddPage
61-
perspectives []operatorv1.Perspective
62-
CAFile string
63-
monitoring map[string]string
64-
customHostnameRedirectPort int
65-
inactivityTimeoutSeconds int
66-
pluginsList map[string]string
67-
pluginsOrder []string
68-
i18nNamespaceList []string
69-
proxyServices []ProxyService
70-
telemetry map[string]string
71-
releaseVersion string
72-
nodeArchitectures []string
73-
nodeOperatingSystems []string
74-
copiedCSVsDisabled bool
75-
oauthClientID string
76-
oidcExtraScopes []string
77-
oidcIssuerURL string
78-
oidcOCLoginCommand string
79-
authType string
80-
sessionEncryptionFile string
81-
sessionAuthenticationFile string
82-
capabilities []operatorv1.Capability
83-
contentSecurityPolicyEnabled bool
84-
contentSecurityPolicyList map[v1.DirectiveType][]string
85-
logos []operatorv1.Logo
86-
techPreviewEnabled bool
49+
host string
50+
logoutRedirectURL string
51+
brand operatorv1.Brand
52+
docURL string
53+
apiServerURL string
54+
controlPlaneToplogy configv1.TopologyMode
55+
statusPageID string
56+
customProductName string
57+
devCatalogCustomization operatorv1.DeveloperConsoleCatalogCustomization
58+
projectAccess operatorv1.ProjectAccess
59+
quickStarts operatorv1.QuickStarts
60+
addPage operatorv1.AddPage
61+
perspectives []operatorv1.Perspective
62+
CAFile string
63+
monitoring map[string]string
64+
customHostnameRedirectPort int
65+
inactivityTimeoutSeconds int
66+
pluginsList map[string]string
67+
pluginsOrder []string
68+
i18nNamespaceList []string
69+
proxyServices []ProxyService
70+
telemetry map[string]string
71+
releaseVersion string
72+
nodeArchitectures []string
73+
nodeOperatingSystems []string
74+
copiedCSVsDisabled bool
75+
oauthClientID string
76+
oidcExtraScopes []string
77+
oidcIssuerURL string
78+
oidcOCLoginCommand string
79+
authType string
80+
sessionEncryptionFile string
81+
sessionAuthenticationFile string
82+
capabilities []operatorv1.Capability
83+
contentSecurityPolicyList map[v1.DirectiveType][]string
84+
logos []operatorv1.Logo
85+
techPreviewEnabled bool
8786
}
8887

8988
func (b *ConsoleServerCLIConfigBuilder) Host(host string) *ConsoleServerCLIConfigBuilder {
@@ -272,11 +271,6 @@ func (b *ConsoleServerCLIConfigBuilder) ContentSecurityPolicies(cspList map[v1.D
272271
return b
273272
}
274273

275-
func (b *ConsoleServerCLIConfigBuilder) ContentSecurityPolicyEnabled(enabled bool) *ConsoleServerCLIConfigBuilder {
276-
b.contentSecurityPolicyEnabled = enabled
277-
return b
278-
}
279-
280274
func (b *ConsoleServerCLIConfigBuilder) I18nNamespaces(i18nNamespaces []string) *ConsoleServerCLIConfigBuilder {
281275
b.i18nNamespaceList = i18nNamespaces
282276
return b
@@ -319,22 +313,21 @@ func (b *ConsoleServerCLIConfigBuilder) TechPreviewEnabled(techPreviewEnabled bo
319313

320314
func (b *ConsoleServerCLIConfigBuilder) Config() Config {
321315
return Config{
322-
Kind: "ConsoleConfig",
323-
APIVersion: "console.openshift.io/v1",
324-
Auth: b.auth(),
325-
Session: b.session(),
326-
ClusterInfo: b.clusterInfo(),
327-
Customization: b.customization(),
328-
ServingInfo: b.servingInfo(),
329-
Providers: b.providers(),
330-
MonitoringInfo: b.monitoringInfo(),
331-
Plugins: b.plugins(),
332-
PluginsOrder: b.getPluginsOrder(),
333-
I18nNamespaces: b.i18nNamespaces(),
334-
Proxy: b.proxy(),
335-
ContentSecurityPolicy: b.contentSecurityPolicy(),
336-
ContentSecurityPolicyEnabled: b.getContentSecurityPolicyEnabled(),
337-
Telemetry: b.telemetry,
316+
Kind: "ConsoleConfig",
317+
APIVersion: "console.openshift.io/v1",
318+
Auth: b.auth(),
319+
Session: b.session(),
320+
ClusterInfo: b.clusterInfo(),
321+
Customization: b.customization(),
322+
ServingInfo: b.servingInfo(),
323+
Providers: b.providers(),
324+
MonitoringInfo: b.monitoringInfo(),
325+
Plugins: b.plugins(),
326+
PluginsOrder: b.getPluginsOrder(),
327+
I18nNamespaces: b.i18nNamespaces(),
328+
Proxy: b.proxy(),
329+
ContentSecurityPolicy: b.contentSecurityPolicy(),
330+
Telemetry: b.telemetry,
338331
}
339332
}
340333

@@ -618,10 +611,6 @@ func (b *ConsoleServerCLIConfigBuilder) contentSecurityPolicy() map[v1.Directive
618611
return b.contentSecurityPolicyList
619612
}
620613

621-
func (b *ConsoleServerCLIConfigBuilder) getContentSecurityPolicyEnabled() bool {
622-
return b.contentSecurityPolicyEnabled
623-
}
624-
625614
func (b *ConsoleServerCLIConfigBuilder) proxy() Proxy {
626615
return Proxy{
627616
Services: b.proxyServices,

‎pkg/console/subresource/consoleserver/types.go‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,21 @@ import (
1818

1919
// Config is the top-level console server cli configuration.
2020
type Config struct {
21-
APIVersion string `yaml:"apiVersion"`
22-
Kind string `yaml:"kind"`
23-
ServingInfo `yaml:"servingInfo"`
24-
ClusterInfo `yaml:"clusterInfo"`
25-
Auth `yaml:"auth"`
26-
Session `yaml:"session"`
27-
Customization `yaml:"customization"`
28-
Providers `yaml:"providers"`
29-
MonitoringInfo `yaml:"monitoringInfo,omitempty"`
30-
Plugins map[string]string `yaml:"plugins,omitempty"`
31-
PluginsOrder []string `yaml:"pluginsOrder,omitempty"`
32-
I18nNamespaces []string `yaml:"i18nNamespaces,omitempty"`
33-
Proxy Proxy `yaml:"proxy,omitempty"`
34-
ContentSecurityPolicy map[v1.DirectiveType][]string `yaml:"contentSecurityPolicy,omitempty"`
35-
ContentSecurityPolicyEnabled bool `yaml:"contentSecurityPolicyEnabled,omitempty"`
36-
Telemetry map[string]string `yaml:"telemetry,omitempty"`
21+
APIVersion string `yaml:"apiVersion"`
22+
Kind string `yaml:"kind"`
23+
ServingInfo `yaml:"servingInfo"`
24+
ClusterInfo `yaml:"clusterInfo"`
25+
Auth `yaml:"auth"`
26+
Session `yaml:"session"`
27+
Customization `yaml:"customization"`
28+
Providers `yaml:"providers"`
29+
MonitoringInfo `yaml:"monitoringInfo,omitempty"`
30+
Plugins map[string]string `yaml:"plugins,omitempty"`
31+
PluginsOrder []string `yaml:"pluginsOrder,omitempty"`
32+
I18nNamespaces []string `yaml:"i18nNamespaces,omitempty"`
33+
Proxy Proxy `yaml:"proxy,omitempty"`
34+
ContentSecurityPolicy map[v1.DirectiveType][]string `yaml:"contentSecurityPolicy,omitempty"`
35+
Telemetry map[string]string `yaml:"telemetry,omitempty"`
3736
}
3837

3938
type Proxy struct {

0 commit comments

Comments
 (0)