Skip to content

Commit

Permalink
partial revert of temporary grpc-only EnvoyFilter (opendatahub-io#931)
Browse files Browse the repository at this point in the history
This partially reverts commit 48e0b8b and removes the corresponding FeatureTracker.

Related: RHOAIENG-165, opendatahub-io#888
(cherry picked from commit 562d09c)
  • Loading branch information
dtrifiro authored and VaishnaviHire committed Jul 24, 2024
1 parent 000c3b5 commit 98db62e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
9 changes: 1 addition & 8 deletions components/kserve/servicemesh_setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,6 @@ func (k *Kserve) defineServiceMeshFeatures(ctx context.Context, cli client.Clien
fmt.Println("WARN: Authorino operator is not installed on the cluster, skipping authorization capability")
}

return registry.Add(feature.Define("kserve-temporary-fixes").
ManifestsLocation(Resources.Location).
Manifests(
path.Join(Resources.ServiceMeshDir, "grpc-envoyfilter-temp-fix.tmpl.yaml"),
).
Managed().
WithData(servicemesh.FeatureData.ControlPlane.Define(dscispec).AsAction()),
)
return nil
}
}
5 changes: 5 additions & 0 deletions pkg/upgrade/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (

dscv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/datasciencecluster/v1"
dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
featuresv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
infrav1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/infrastructure/v1"
"github.com/opendatahub-io/opendatahub-operator/v2/components"
"github.com/opendatahub-io/opendatahub-operator/v2/components/codeflare"
Expand Down Expand Up @@ -249,6 +250,10 @@ func CleanupExistingResource(ctx context.Context, cli client.Client, platform cl
// Handling for dashboard OdhApplication Jupyterhub CR, see jira #443
multiErr = multierror.Append(multiErr, removOdhApplicationsCR(ctx, cli, gvk.OdhApplication, "jupyterhub", dscApplicationsNamespace))

// cleanup for github.com/opendatahub-io/pull/888
deprecatedFeatureTrackers := []string{dscApplicationsNamespace + "-kserve-temporary-fixes"}
multiErr = multierror.Append(multiErr, deleteDeprecatedResources(ctx, cli, dscApplicationsNamespace, deprecatedFeatureTrackers, &featuresv1.FeatureTrackerList{}))

// Handling for dashboard OdhDocument Jupyterhub CR, see jira #443 comments
odhDocJPH := getJPHOdhDocumentResources(
dscApplicationsNamespace,
Expand Down

0 comments on commit 98db62e

Please sign in to comment.