Skip to content

Commit 68f4ea5

Browse files
authored
fix: remove deprecated DefaultContentListView (#84)
1 parent 03956eb commit 68f4ea5

File tree

5 files changed

+25
-51
lines changed

5 files changed

+25
-51
lines changed

api/core/v1beta1/connect_config.go

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,14 @@ type ConnectSchedulerConfig struct {
114114
MaxAMDGPULimit int `json:"MaxAMDGPULimit,omitempty"`
115115
}
116116

117-
type ContentListView string
118-
119-
const (
120-
ContentListViewCompact ContentListView = "compact"
121-
ContentListViewExpanded ContentListView = "expanded"
122-
)
123-
124117
type ConnectServerConfig struct {
125-
Address string `json:"Address,omitempty"`
126-
DataDir string `json:"DataDir,omitempty"`
127-
FrameOptionsContent string `json:"FrameOptionsContent,omitempty"`
128-
FrameOptionsDashboard string `json:"FrameOptionsDashboard,omitempty"`
129-
DefaultContentListView ContentListView `json:"DefaultContentListView,omitempty"`
130-
LoggedInWarning string `json:"LoggedInWarning,omitempty"`
131-
PublicWarning string `json:"PublicWarning,omitempty"`
132-
ProxyHeaderLogging bool `json:"ProxyHeaderLogging,omitempty"`
118+
Address string `json:"Address,omitempty"`
119+
DataDir string `json:"DataDir,omitempty"`
120+
FrameOptionsContent string `json:"FrameOptionsContent,omitempty"`
121+
FrameOptionsDashboard string `json:"FrameOptionsDashboard,omitempty"`
122+
LoggedInWarning string `json:"LoggedInWarning,omitempty"`
123+
PublicWarning string `json:"PublicWarning,omitempty"`
124+
ProxyHeaderLogging bool `json:"ProxyHeaderLogging,omitempty"`
133125
// EmailProvider sets the email provider for Connect emails. If set, secrets will be mounted for SMTP connections
134126
EmailProvider string `json:"EmailProvider,omitempty"`
135127
SenderEmail string `json:"SenderEmail,omitempty"`

client-go/applyconfiguration/core/v1beta1/connectserverconfig.go

Lines changed: 12 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/core.posit.team_connects.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,6 @@ spec:
393393
type: string
394394
DataDir:
395395
type: string
396-
DefaultContentListView:
397-
type: string
398396
EmailProvider:
399397
description: EmailProvider sets the email provider for Connect
400398
emails. If set, secrets will be mounted for SMTP connections

dist/chart/templates/crd/core.posit.team_connects.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,6 @@ spec:
414414
type: string
415415
DataDir:
416416
type: string
417-
DefaultContentListView:
418-
type: string
419417
EmailProvider:
420418
description: EmailProvider sets the email provider for Connect
421419
emails. If set, secrets will be mounted for SMTP connections

internal/controller/core/site_controller_connect.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,12 @@ func (r *SiteReconciler) reconcileConnect(
7171
},
7272
Server: &v1beta1.ConnectServerConfig{
7373
// This will be filled in by the controller... see "Url" below
74-
Address: "",
75-
FrameOptionsDashboard: "NONE",
76-
FrameOptionsContent: "NONE",
77-
DefaultContentListView: v1beta1.ContentListViewCompact,
78-
LoggedInWarning: site.Spec.Connect.LoggedInWarning,
79-
PublicWarning: site.Spec.Connect.PublicWarning,
80-
HideEmailAddresses: true,
74+
Address: "",
75+
FrameOptionsDashboard: "NONE",
76+
FrameOptionsContent: "NONE",
77+
LoggedInWarning: site.Spec.Connect.LoggedInWarning,
78+
PublicWarning: site.Spec.Connect.PublicWarning,
79+
HideEmailAddresses: true,
8180
},
8281
Http: &v1beta1.ConnectHttpConfig{
8382
ForceSecure: true,

0 commit comments

Comments
 (0)