implemented disambiguator in api names

asafalgawi · Apr 2, 2024 · ad54677 · ad54677
1 parent 45e4552
commit ad54677
Show file tree

Hide file tree

Showing 65 changed files with 333 additions and 142 deletions.
diff --git a/apis/config/groups.go b/apis/config/groups.go
@@ -0,0 +1,9 @@
+package config
+
+import (
+	"fmt"
+
+	"github.com/open-policy-agent/gatekeeper/v3/apis/disambiguator"
+)
+
+var ConfigGroupName = fmt.Sprintf("config.%s%s", disambiguator.Disambiguator, disambiguator.GatekeeprApiSuffix)
diff --git a/apis/config/v1alpha1/groupversion_info.go b/apis/config/v1alpha1/groupversion_info.go
@@ -19,13 +19,14 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"github.com/open-policy-agent/gatekeeper/v3/apis/config"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "config.gatekeeper.sh", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: config.ConfigGroupName, Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/apis/disambiguator/disambiguator.go b/apis/disambiguator/disambiguator.go
@@ -0,0 +1,19 @@
+package disambiguator
+
+import (
+	"fmt"
+	"os"
+)
+
+const GatekeeprApiSuffix = "gatekeeper.sh"
+
+var Disambiguator string = readDisambiguatorFromEnvVars()
+
+func readDisambiguatorFromEnvVars() string {
+	value, exists := os.LookupEnv("GATEKEEPER_API_NAME_DISAMBIGUATOR")
+	if exists {
+		return fmt.Sprintf("%s-", value)
+	}
+
+	return ""
+}
diff --git a/apis/expansion/groups.go b/apis/expansion/groups.go
@@ -0,0 +1,9 @@
+package expansion
+
+import (
+	"fmt"
+
+	"github.com/open-policy-agent/gatekeeper/v3/apis/disambiguator"
+)
+
+var ExpansionGroupName = fmt.Sprintf("expansion.%s%s", disambiguator.Disambiguator, disambiguator.GatekeeprApiSuffix)
diff --git a/apis/expansion/v1beta1/groupversion_info.go b/apis/expansion/v1beta1/groupversion_info.go
@@ -19,14 +19,15 @@ limitations under the License.
 package v1beta1
 
 import (
+	"github.com/open-policy-agent/gatekeeper/v3/apis/expansion"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "expansion.gatekeeper.sh", Version: "v1beta1"}
+	GroupVersion = schema.GroupVersion{Group: expansion.ExpansionGroupName, Version: "v1beta1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/apis/mutations/group.go b/apis/mutations/group.go
@@ -0,0 +1,9 @@
+package mutations
+
+import (
+	"fmt"
+
+	"github.com/open-policy-agent/gatekeeper/v3/apis/disambiguator"
+)
+
+var MutationGroupName string = fmt.Sprintf("mutations.%s%s", disambiguator.Disambiguator, disambiguator.GatekeeprApiSuffix)
diff --git a/apis/mutations/v1/groupversion_info.go b/apis/mutations/v1/groupversion_info.go
@@ -19,14 +19,15 @@ limitations under the License.
 package v1
 
 import (
+	"github.com/open-policy-agent/gatekeeper/v3/apis/mutations"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "mutations.gatekeeper.sh", Version: "v1"}
+	GroupVersion = schema.GroupVersion{Group: mutations.MutationGroupName, Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/apis/mutations/v1alpha1/groupversion_info.go b/apis/mutations/v1alpha1/groupversion_info.go
@@ -19,14 +19,15 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"github.com/open-policy-agent/gatekeeper/v3/apis/mutations"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "mutations.gatekeeper.sh", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: mutations.MutationGroupName, Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/apis/mutations/v1beta1/groupversion_info.go b/apis/mutations/v1beta1/groupversion_info.go
@@ -19,14 +19,15 @@ limitations under the License.
 package v1beta1
 
 import (
+	"github.com/open-policy-agent/gatekeeper/v3/apis/mutations"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "mutations.gatekeeper.sh", Version: "v1beta1"}
+	GroupVersion = schema.GroupVersion{Group: mutations.MutationGroupName, Version: "v1beta1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/apis/status/groups.go b/apis/status/groups.go
@@ -0,0 +1,10 @@
+package status
+
+import (
+	"fmt"
+
+	"github.com/open-policy-agent/gatekeeper/v3/apis/disambiguator"
+)
+
+var StatusGroupName string = fmt.Sprintf("status.%s%s", disambiguator.Disambiguator, disambiguator.GatekeeprApiSuffix)
+var ConstraintsGroupName = fmt.Sprintf("constraints.%s%s", disambiguator.Disambiguator, disambiguator.GatekeeprApiSuffix)
diff --git a/apis/status/v1beta1/constraintpodstatus_types.go b/apis/status/v1beta1/constraintpodstatus_types.go
@@ -18,6 +18,7 @@ package v1beta1
 import (
 	"strings"
 
+	"github.com/open-policy-agent/gatekeeper/v3/apis/status"
 	"github.com/open-policy-agent/gatekeeper/v3/pkg/operations"
 	"github.com/open-policy-agent/gatekeeper/v3/pkg/util"
 	corev1 "k8s.io/api/core/v1"
@@ -28,8 +29,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
-// ConstraintsGroup is the API Group for Gatekeeper Constraints.
-const ConstraintsGroup = "constraints.gatekeeper.sh"
+// ConstraintsGroupName is the API Group for Gatekeeper Constraints.
+var ConstraintsGroupName = status.ConstraintsGroupName
 
 // ConstraintPodStatusStatus defines the observed state of ConstraintPodStatus.
 type ConstraintPodStatusStatus struct {

diff --git a/apis/status/v1beta1/constraintpodstatus_types_test.go b/apis/status/v1beta1/constraintpodstatus_types_test.go
@@ -39,7 +39,7 @@ func TestNewConstraintStatusForPod(t *testing.T) {
 	)
 
 	cstr := &unstructured.Unstructured{}
-	cstr.SetGroupVersionKind(schema.GroupVersionKind{Group: v1beta1.ConstraintsGroup, Version: "v1beta1", Kind: cstrKind})
+	cstr.SetGroupVersionKind(schema.GroupVersionKind{Group: v1beta1.ConstraintsGroupName, Version: "v1beta1", Kind: cstrKind})
 	cstr.SetName(cstrName)
 
 	wantStatus := &v1beta1.ConstraintPodStatus{}

diff --git a/apis/status/v1beta1/groupversion_info.go b/apis/status/v1beta1/groupversion_info.go
@@ -19,13 +19,14 @@ limitations under the License.
 package v1beta1
 
 import (
+	"github.com/open-policy-agent/gatekeeper/v3/apis/status"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "status.gatekeeper.sh", Version: "v1beta1"}
+	GroupVersion = schema.GroupVersion{Group: status.StatusGroupName, Version: "v1beta1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/apis/status/v1beta1/mutatorpodstatus_types.go b/apis/status/v1beta1/mutatorpodstatus_types.go
@@ -18,6 +18,7 @@ package v1beta1
 import (
 	"strings"
 
+	"github.com/open-policy-agent/gatekeeper/v3/apis/mutations"
 	mtypes "github.com/open-policy-agent/gatekeeper/v3/pkg/mutation/types"
 	"github.com/open-policy-agent/gatekeeper/v3/pkg/operations"
 	"github.com/open-policy-agent/gatekeeper/v3/pkg/util"
@@ -29,7 +30,7 @@ import (
 )
 
 // MutationsGroup is the API Group for Gatekeeper Mutators.
-const MutationsGroup = "mutations.gatekeeper.sh"
+var MutationsGroup = mutations.MutationGroupName
 
 // MutatorPodStatusStatus defines the observed state of MutatorPodStatus.
 type MutatorPodStatusStatus struct {

diff --git a/apis/syncset/groups.go b/apis/syncset/groups.go
@@ -0,0 +1,9 @@
+package syncset
+
+import (
+	"fmt"
+
+	"github.com/open-policy-agent/gatekeeper/v3/apis/disambiguator"
+)
+
+var SyncSetGroupNama = fmt.Sprintf("syncset.%s%s", disambiguator.Disambiguator, disambiguator.GatekeeprApiSuffix)
diff --git a/apis/syncset/v1alpha1/groupversion_info.go b/apis/syncset/v1alpha1/groupversion_info.go
@@ -4,13 +4,14 @@
 package v1alpha1
 
 import (
+	"github.com/open-policy-agent/gatekeeper/v3/apis/syncset"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "syncset.gatekeeper.sh", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: syncset.SyncSetGroupNama, Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/charts/gatekeeper/crds/assign-customresourcedefinition.yaml b/charts/gatekeeper/crds/assign-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: assign.mutations.gatekeeper.sh
+  name: assign.mutations.asafalg-gatekeeper.sh
 spec:
-  group: mutations.gatekeeper.sh
+  group: mutations.asafalg-gatekeeper.sh
   names:
     kind: Assign
     listKind: AssignList

diff --git a/charts/gatekeeper/crds/assignimage-customresourcedefinition.yaml b/charts/gatekeeper/crds/assignimage-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: assignimage.mutations.gatekeeper.sh
+  name: assignimage.mutations.asafalg-gatekeeper.sh
 spec:
-  group: mutations.gatekeeper.sh
+  group: mutations.asafalg-gatekeeper.sh
   names:
     kind: AssignImage
     listKind: AssignImageList

diff --git a/charts/gatekeeper/crds/assignmetadata-customresourcedefinition.yaml b/charts/gatekeeper/crds/assignmetadata-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: assignmetadata.mutations.gatekeeper.sh
+  name: assignmetadata.mutations.asafalg-gatekeeper.sh
 spec:
-  group: mutations.gatekeeper.sh
+  group: mutations.asafalg-gatekeeper.sh
   names:
     kind: AssignMetadata
     listKind: AssignMetadataList

diff --git a/charts/gatekeeper/crds/config-customresourcedefinition.yaml b/charts/gatekeeper/crds/config-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: configs.config.gatekeeper.sh
+  name: configs.config.asafalg-gatekeeper.sh
 spec:
-  group: config.gatekeeper.sh
+  group: config.asafalg-gatekeeper.sh
   names:
     kind: Config
     listKind: ConfigList

diff --git a/charts/gatekeeper/crds/constraintpodstatus-customresourcedefinition.yaml b/charts/gatekeeper/crds/constraintpodstatus-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: constraintpodstatuses.status.gatekeeper.sh
+  name: constraintpodstatuses.status.asafalg-gatekeeper.sh
 spec:
-  group: status.gatekeeper.sh
+  group: status.asafalg-gatekeeper.sh
   names:
     kind: ConstraintPodStatus
     listKind: ConstraintPodStatusList

diff --git a/charts/gatekeeper/crds/constrainttemplate-customresourcedefinition.yaml b/charts/gatekeeper/crds/constrainttemplate-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: constrainttemplates.templates.gatekeeper.sh
+  name: constrainttemplates.templates.asafalg-gatekeeper.sh
 spec:
-  group: templates.gatekeeper.sh
+  group: templates.asafalg-gatekeeper.sh
   names:
     kind: ConstraintTemplate
     listKind: ConstraintTemplateList

diff --git a/charts/gatekeeper/crds/constrainttemplatepodstatus-customresourcedefinition.yaml b/charts/gatekeeper/crds/constrainttemplatepodstatus-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: constrainttemplatepodstatuses.status.gatekeeper.sh
+  name: constrainttemplatepodstatuses.status.asafalg-gatekeeper.sh
 spec:
-  group: status.gatekeeper.sh
+  group: status.asafalg-gatekeeper.sh
   names:
     kind: ConstraintTemplatePodStatus
     listKind: ConstraintTemplatePodStatusList

diff --git a/charts/gatekeeper/crds/expansiontemplate-customresourcedefinition.yaml b/charts/gatekeeper/crds/expansiontemplate-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: expansiontemplate.expansion.gatekeeper.sh
+  name: expansiontemplate.expansion.asafalg-gatekeeper.sh
 spec:
-  group: expansion.gatekeeper.sh
+  group: expansion.asafalg-gatekeeper.sh
   names:
     kind: ExpansionTemplate
     listKind: ExpansionTemplateList

diff --git a/charts/gatekeeper/crds/expansiontemplatepodstatus-customresourcedefinition.yaml b/charts/gatekeeper/crds/expansiontemplatepodstatus-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: expansiontemplatepodstatuses.status.gatekeeper.sh
+  name: expansiontemplatepodstatuses.status.asafalg-gatekeeper.sh
 spec:
-  group: status.gatekeeper.sh
+  group: status.asafalg-gatekeeper.sh
   names:
     kind: ExpansionTemplatePodStatus
     listKind: ExpansionTemplatePodStatusList

diff --git a/charts/gatekeeper/crds/modifyset-customresourcedefinition.yaml b/charts/gatekeeper/crds/modifyset-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: modifyset.mutations.gatekeeper.sh
+  name: modifyset.mutations.asafalg-gatekeeper.sh
 spec:
-  group: mutations.gatekeeper.sh
+  group: mutations.asafalg-gatekeeper.sh
   names:
     kind: ModifySet
     listKind: ModifySetList

diff --git a/charts/gatekeeper/crds/mutatorpodstatus-customresourcedefinition.yaml b/charts/gatekeeper/crds/mutatorpodstatus-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: mutatorpodstatuses.status.gatekeeper.sh
+  name: mutatorpodstatuses.status.asafalg-gatekeeper.sh
 spec:
-  group: status.gatekeeper.sh
+  group: status.asafalg-gatekeeper.sh
   names:
     kind: MutatorPodStatus
     listKind: MutatorPodStatusList

diff --git a/charts/gatekeeper/crds/provider-customresourcedefinition.yaml b/charts/gatekeeper/crds/provider-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: providers.externaldata.gatekeeper.sh
+  name: providers.externaldata.asafalg-gatekeeper.sh
 spec:
-  group: externaldata.gatekeeper.sh
+  group: externaldata.asafalg-gatekeeper.sh
   names:
     kind: Provider
     listKind: ProviderList

diff --git a/charts/gatekeeper/crds/syncset-customresourcedefinition.yaml b/charts/gatekeeper/crds/syncset-customresourcedefinition.yaml
@@ -5,9 +5,9 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     gatekeeper.sh/system: "yes"
-  name: syncsets.syncset.gatekeeper.sh
+  name: syncsets.syncset.asafalg-gatekeeper.sh
 spec:
-  group: syncset.gatekeeper.sh
+  group: syncset.asafalg-gatekeeper.sh
   names:
     kind: SyncSet
     listKind: SyncSetList

diff --git a/charts/gatekeeper/templates/gatekeeper-audit-deployment.yaml b/charts/gatekeeper/templates/gatekeeper-audit-deployment.yaml
@@ -106,6 +106,8 @@ spec:
           value: manager
         - name: OTEL_RESOURCE_ATTRIBUTES
           value: k8s.pod.name=$(POD_NAME),k8s.namespace.name=$(NAMESPACE),k8s.container.name=$(CONTAINER_NAME)
+        - name: GATEKEEPER_API_NAME_DISAMBIGUATOR
+          value: asafalg
         imagePullPolicy: '{{ .Values.image.pullPolicy }}'
         livenessProbe:
           httpGet: