Skip to content

Commit f14b62b

Browse files
Include "project.openshift.io" API group when aceshifter feature is enabled (#28)
Signed-off-by: Rokibul Hasan <mdrokibulhasan@appscode.com>
1 parent 02b58ba commit f14b62b

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

pkg/cluster_upgrade/upgrader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func UpgradeCluster(profileBinding *profilev1alpha1.ManagedClusterProfileBinding
4848

4949
var fakeServer *feature_installer.FakeServer
5050
var err error
51-
if fakeServer, err = feature_installer.StartFakeApiServerAndApplyBaseManifestWorkReplicaSets(context.Background(), kc); err != nil {
51+
if fakeServer, err = feature_installer.StartFakeApiServerAndApplyBaseManifestWorkReplicaSets(context.Background(), kc, profileBinding); err != nil {
5252
return err
5353
}
5454

pkg/feature_installer/enable_featureset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func enableFeatureSet(ctx context.Context, kc client.Client, featureSet string,
128128
// <<<<<<<< start fake-apiserver and apply base manifestWorkReplicaSet, feature-namespace manifestWork and helm install 'opscenter-features' chart >>>>>>>
129129
var err error
130130
var fakeServer *FakeServer
131-
if fakeServer, err = StartFakeApiServerAndApplyBaseManifestWorkReplicaSets(ctx, kc); err != nil {
131+
if fakeServer, err = StartFakeApiServerAndApplyBaseManifestWorkReplicaSets(ctx, kc, profileBinding); err != nil {
132132
return err
133133
}
134134

pkg/feature_installer/helpers.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,18 @@ func GetAPIGroups() []string {
120120
"ui.kubedb.com",
121121
"ui.stash.appscode.com",
122122
"work.open-cluster-management.io",
123-
"project.openshift.io",
124123
}
125124
}
126125

127-
func initializeFakeServer() (*http.Server, *pkg.Server, *rest.Config, *api.Config) {
126+
func initializeFakeServer(profileBinding *profilev1alpha1.ManagedClusterProfileBinding) (*http.Server, *pkg.Server, *rest.Config, *api.Config) {
128127
apiGroups := GetAPIGroups()
128+
129+
if profileBinding != nil && profileBinding.Spec.Features != nil {
130+
if _, ok := profileBinding.Spec.Features["aceshifter"]; ok {
131+
apiGroups = append(apiGroups, "project.openshift.io")
132+
}
133+
}
134+
129135
opts := pkg.NewOptions(apiGroups...)
130136

131137
s := pkg.NewServer(opts)
@@ -143,10 +149,10 @@ func initializeFakeServer() (*http.Server, *pkg.Server, *rest.Config, *api.Confi
143149
return srv, s, restcfg, kubecfg
144150
}
145151

146-
func StartFakeApiServerAndApplyBaseManifestWorkReplicaSets(ctx context.Context, kc client.Client) (*FakeServer, error) {
152+
func StartFakeApiServerAndApplyBaseManifestWorkReplicaSets(ctx context.Context, kc client.Client, profileBinding *profilev1alpha1.ManagedClusterProfileBinding) (*FakeServer, error) {
147153
var fakeServer FakeServer
148154
var err error
149-
fakeServer.FakeSrv, fakeServer.FakeS, fakeServer.FakeRestConfig, fakeServer.FakeApiConfig = initializeFakeServer()
155+
fakeServer.FakeSrv, fakeServer.FakeS, fakeServer.FakeRestConfig, fakeServer.FakeApiConfig = initializeFakeServer(profileBinding)
150156
fakeServer.FakeClient, err = utils.GetNewRuntimeClient(fakeServer.FakeRestConfig)
151157
if err != nil {
152158
return nil, err

0 commit comments

Comments
 (0)