Skip to content

Commit

Permalink
fixup! fixup! fixup! WASM plugin configuration object v2
Browse files Browse the repository at this point in the history
  • Loading branch information
eguzki committed Jun 13, 2023
1 parent 53c6997 commit 5c06205
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 15 deletions.
6 changes: 0 additions & 6 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ patchesStrategicMerge:
#+kubebuilder:scaffold:crdkustomizecainjectionpatch

patchesJson6902:
- path: patches/action_specifier_oneof_openapi_validation_in_ratelimitpolicy.yaml
target:
group: apiextensions.k8s.io
version: v1
kind: CustomResourceDefinition
name: ratelimitpolicies.kuadrant.io

# the following config is for teaching kustomize how to do kustomization for CRDs.
configurations:
Expand Down

This file was deleted.

2 changes: 2 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import (
gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2"
"github.com/kuadrant/kuadrant-operator/controllers"
"github.com/kuadrant/kuadrant-operator/pkg/common"
"github.com/kuadrant/kuadrant-operator/pkg/log"
Expand Down Expand Up @@ -73,6 +74,7 @@ func init() {
utilruntime.Must(istioapis.AddToScheme(scheme))
utilruntime.Must(maistraapis.AddToScheme(scheme))
utilruntime.Must(kuadrantv1beta1.AddToScheme(scheme))
utilruntime.Must(kuadrantv1beta2.AddToScheme(scheme))

//+kubebuilder:scaffold:scheme

Expand Down
2 changes: 1 addition & 1 deletion pkg/rlptools/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
)

func FullLimitName(rlp *kuadrantv1beta2.RateLimitPolicy, limitKey string) string {
return fmt.Sprintf("%s/%s/%s", rlp.GetName(), rlp.GetNamespace(), limitKey)
return fmt.Sprintf("%s/%s/%s", rlp.GetNamespace(), rlp.GetName(), limitKey)
}

// ReadLimitsFromRLP returns a list of Kuadrant limit objects that will be used as template
Expand Down

0 comments on commit 5c06205

Please sign in to comment.