Skip to content

Commit ddbde29

Browse files
committed
Add FF to disable URL population.
Signed-off-by: Mangirdas Judeikis <Mangirdas@Judeikis.LT> On-behalf-of: @SAP mangirdas.judeikis@sap.com
1 parent 54966ed commit ddbde29

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

pkg/features/kcp_features.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ const (
4242
// alpha: v0.1
4343
// Enables workspace mounts via frontProxy.
4444
WorkspaceMounts featuregate.Feature = "WorkspaceMounts"
45+
46+
// owner: @mjudeikis
47+
// alpha: v0.1
48+
// Enables Poplaing VirtualWorkspace urls on APIExport. This enables to use Deprecated APIExport VirtualWorkspace urls.
49+
// This is a temporary feature to ease the migration to the new VirtualWorkspace urls.
50+
EnableDeprecatedAPIExportVirtualWorkspacesUrls featuregate.Feature = "EnableDeprecatedAPIExportVirtualWorkspacesUrls"
4551
)
4652

4753
// DefaultFeatureGate exposes the upstream feature gate, but with our gate setting applied.
@@ -112,7 +118,9 @@ var defaultVersionedGenericControlPlaneFeatureGates = map[featuregate.Feature]fe
112118
WorkspaceMounts: {
113119
{Version: version.MustParse("1.28"), Default: false, PreRelease: featuregate.Alpha},
114120
},
115-
121+
EnableDeprecatedAPIExportVirtualWorkspacesUrls: {
122+
{Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Alpha},
123+
},
116124
// inherited features from generic apiserver, relisted here to get a conflict if it is changed
117125
// unintentionally on either side:
118126

pkg/reconciler/apis/apiexport/apiexport_reconcile.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"net/url"
2323
"path"
2424

25+
kcpfeatures "github.com/kcp-dev/kcp/pkg/features"
2526
corev1 "k8s.io/api/core/v1"
2627
"k8s.io/apimachinery/pkg/api/errors"
2728
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -111,15 +112,18 @@ func (c *controller) reconcile(ctx context.Context, apiExport *apisv1alpha2.APIE
111112
}
112113
*/
113114

114-
if err := c.updateVirtualWorkspaceURLs(ctx, apiExport); err != nil {
115-
conditions.MarkFalse(
116-
apiExport,
117-
apisv1alpha2.APIExportVirtualWorkspaceURLsReady,
118-
apisv1alpha2.ErrorGeneratingURLsReason,
119-
conditionsv1alpha1.ConditionSeverityError,
120-
"%v",
121-
err,
122-
)
115+
// TODO(mjudeikis): Remove this and move to batteries.
116+
if !kcpfeatures.DefaultFeatureGate.Enabled(kcpfeatures.EnableDeprecatedAPIExportVirtualWorkspacesUrls) {
117+
if err := c.updateVirtualWorkspaceURLs(ctx, apiExport); err != nil {
118+
conditions.MarkFalse(
119+
apiExport,
120+
apisv1alpha2.APIExportVirtualWorkspaceURLsReady,
121+
apisv1alpha2.ErrorGeneratingURLsReason,
122+
conditionsv1alpha1.ConditionSeverityError,
123+
"%v",
124+
err,
125+
)
126+
}
123127
}
124128

125129
return nil

0 commit comments

Comments
 (0)