feat: add api folder (#300)

Signed-off-by: Charles-Edouard Brétéché <[email protected]>
kyverno · Feb 6, 2024 · 89ecfdc · 89ecfdc
1 parent e132477
commit 89ecfdc
Show file tree

Hide file tree

Showing 43 changed files with 34 additions and 35 deletions.
diff --git a/Makefile b/Makefile
@@ -148,9 +148,8 @@ ko-build: $(KO) ## Build image (with ko)
 
 GOPATH_SHIM                 := ${PWD}/.gopath
 PACKAGE_SHIM                := $(GOPATH_SHIM)/src/$(PACKAGE)
-INPUT_DIRS                  := $(PACKAGE)/pkg/apis/v1alpha1
+INPUT_DIRS                  := $(PACKAGE)/pkg/apis/policy/v1alpha1
 CRDS_PATH                   := ${PWD}/.crds
-INPUT_DIRS                  := $(PACKAGE)/pkg/apis/v1alpha1
 OUT_PACKAGE                 := $(PACKAGE)/pkg/client
 CLIENTSET_PACKAGE           := $(OUT_PACKAGE)/clientset
 LISTERS_PACKAGE             := $(OUT_PACKAGE)/listers

diff --git a/pkg/apis/v1alpha1/any.go → pkg/apis/policy/v1alpha1/any.go b/pkg/apis/v1alpha1/any.go → pkg/apis/policy/v1alpha1/any.go
diff --git a/pkg/apis/v1alpha1/any_test.go → pkg/apis/policy/v1alpha1/any_test.go b/pkg/apis/v1alpha1/any_test.go → pkg/apis/policy/v1alpha1/any_test.go
diff --git a/pkg/apis/v1alpha1/assert.go → pkg/apis/policy/v1alpha1/assert.go b/pkg/apis/v1alpha1/assert.go → pkg/apis/policy/v1alpha1/assert.go
diff --git a/pkg/apis/v1alpha1/assertion.go → pkg/apis/policy/v1alpha1/assertion.go b/pkg/apis/v1alpha1/assertion.go → pkg/apis/policy/v1alpha1/assertion.go
diff --git a/pkg/apis/v1alpha1/context_entry.go → pkg/apis/policy/v1alpha1/context_entry.go b/pkg/apis/v1alpha1/context_entry.go → pkg/apis/policy/v1alpha1/context_entry.go
diff --git a/pkg/apis/v1alpha1/doc.go → pkg/apis/policy/v1alpha1/doc.go b/pkg/apis/v1alpha1/doc.go → pkg/apis/policy/v1alpha1/doc.go
diff --git a/pkg/apis/v1alpha1/match.go → pkg/apis/policy/v1alpha1/match.go b/pkg/apis/v1alpha1/match.go → pkg/apis/policy/v1alpha1/match.go
diff --git a/pkg/apis/v1alpha1/validating_policy.go → ...apis/policy/v1alpha1/validating_policy.go b/pkg/apis/v1alpha1/validating_policy.go → ...apis/policy/v1alpha1/validating_policy.go
diff --git a/pkg/apis/v1alpha1/validating_policy_spec.go → ...policy/v1alpha1/validating_policy_spec.go b/pkg/apis/v1alpha1/validating_policy_spec.go → ...policy/v1alpha1/validating_policy_spec.go
diff --git a/pkg/apis/v1alpha1/validating_rule.go → pkg/apis/policy/v1alpha1/validating_rule.go b/pkg/apis/v1alpha1/validating_rule.go → pkg/apis/policy/v1alpha1/validating_rule.go
diff --git a/pkg/apis/v1alpha1/zz_generated.deepcopy.go → .../policy/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/v1alpha1/zz_generated.deepcopy.go → .../policy/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/v1alpha1/zz_generated.register.go → .../policy/v1alpha1/zz_generated.register.go b/pkg/apis/v1alpha1/zz_generated.register.go → .../policy/v1alpha1/zz_generated.register.go
diff --git a/pkg/binding/binding.go b/pkg/binding/binding.go
@@ -2,7 +2,7 @@ package binding
 
 import (
 	"github.com/jmespath-community/go-jmespath/pkg/binding"
-	"github.com/kyverno/kyverno-json/pkg/apis/v1alpha1"
+	"github.com/kyverno/kyverno-json/pkg/apis/policy/v1alpha1"
 	"github.com/kyverno/kyverno-json/pkg/engine/assert"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )

diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go
diff --git a/...tset/versioned/typed/apis/v1alpha1/doc.go → ...et/versioned/typed/policy/v1alpha1/doc.go b/...tset/versioned/typed/apis/v1alpha1/doc.go → ...et/versioned/typed/policy/v1alpha1/doc.go
diff --git a/...versioned/typed/apis/v1alpha1/fake/doc.go → ...rsioned/typed/policy/v1alpha1/fake/doc.go b/...versioned/typed/apis/v1alpha1/fake/doc.go → ...rsioned/typed/policy/v1alpha1/fake/doc.go
diff --git a/...ed/apis/v1alpha1/fake/fake_apis_client.go → ...olicy/v1alpha1/fake/fake_policy_client.go b/...ed/apis/v1alpha1/fake/fake_apis_client.go → ...olicy/v1alpha1/fake/fake_policy_client.go
diff --git a/...is/v1alpha1/fake/fake_validatingpolicy.go → ...cy/v1alpha1/fake/fake_validatingpolicy.go b/...is/v1alpha1/fake/fake_validatingpolicy.go → ...cy/v1alpha1/fake/fake_validatingpolicy.go
diff --git a/...yped/apis/v1alpha1/generated_expansion.go → ...ed/policy/v1alpha1/generated_expansion.go b/...yped/apis/v1alpha1/generated_expansion.go → ...ed/policy/v1alpha1/generated_expansion.go
diff --git a/...sioned/typed/apis/v1alpha1/apis_client.go → ...ed/typed/policy/v1alpha1/policy_client.go b/...sioned/typed/apis/v1alpha1/apis_client.go → ...ed/typed/policy/v1alpha1/policy_client.go
diff --git a/...d/typed/apis/v1alpha1/validatingpolicy.go → ...typed/policy/v1alpha1/validatingpolicy.go b/...d/typed/apis/v1alpha1/validatingpolicy.go → ...typed/policy/v1alpha1/validatingpolicy.go
diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go
diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go
diff --git a/...ormers/externalversions/apis/interface.go → ...mers/externalversions/policy/interface.go b/...ormers/externalversions/apis/interface.go → ...mers/externalversions/policy/interface.go
diff --git a/...ternalversions/apis/v1alpha1/interface.go → ...rnalversions/policy/v1alpha1/interface.go b/...ternalversions/apis/v1alpha1/interface.go → ...rnalversions/policy/v1alpha1/interface.go
diff --git a/...ersions/apis/v1alpha1/validatingpolicy.go → ...sions/policy/v1alpha1/validatingpolicy.go b/...ersions/apis/v1alpha1/validatingpolicy.go → ...sions/policy/v1alpha1/validatingpolicy.go
diff --git a/...ters/apis/v1alpha1/expansion_generated.go → ...rs/policy/v1alpha1/expansion_generated.go b/...ters/apis/v1alpha1/expansion_generated.go → ...rs/policy/v1alpha1/expansion_generated.go
diff --git a/...listers/apis/v1alpha1/validatingpolicy.go → ...sters/policy/v1alpha1/validatingpolicy.go b/...listers/apis/v1alpha1/validatingpolicy.go → ...sters/policy/v1alpha1/validatingpolicy.go
diff --git a/pkg/commands/scan/options.go b/pkg/commands/scan/options.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/kyverno/kyverno-json/pkg/apis/v1alpha1"
+	"github.com/kyverno/kyverno-json/pkg/apis/policy/v1alpha1"
 	"github.com/kyverno/kyverno-json/pkg/engine/template"
 	jsonengine "github.com/kyverno/kyverno-json/pkg/json-engine"
 	"github.com/kyverno/kyverno-json/pkg/payload"

diff --git a/pkg/commands/serve/provider.go b/pkg/commands/serve/provider.go
@@ -3,7 +3,7 @@ package serve
 import (
 	"context"
 
-	"github.com/kyverno/kyverno-json/pkg/apis/v1alpha1"
+	"github.com/kyverno/kyverno-json/pkg/apis/policy/v1alpha1"
 	"github.com/kyverno/kyverno-json/pkg/client/clientset/versioned"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/pkg/json-engine/engine.go b/pkg/json-engine/engine.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	jpbinding "github.com/jmespath-community/go-jmespath/pkg/binding"
-	"github.com/kyverno/kyverno-json/pkg/apis/v1alpha1"
+	"github.com/kyverno/kyverno-json/pkg/apis/policy/v1alpha1"
 	"github.com/kyverno/kyverno-json/pkg/binding"
 	"github.com/kyverno/kyverno-json/pkg/engine"
 	"github.com/kyverno/kyverno-json/pkg/engine/builder"

diff --git a/pkg/matching/match.go b/pkg/matching/match.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 
 	"github.com/jmespath-community/go-jmespath/pkg/binding"
-	"github.com/kyverno/kyverno-json/pkg/apis/v1alpha1"
+	"github.com/kyverno/kyverno-json/pkg/apis/policy/v1alpha1"
 	"github.com/kyverno/kyverno-json/pkg/engine/assert"
 	"github.com/kyverno/kyverno-json/pkg/engine/template"
 	"k8s.io/apimachinery/pkg/util/validation/field"

diff --git a/pkg/policy/load.go b/pkg/policy/load.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/kyverno/kyverno-json/pkg/apis/v1alpha1"
+	"github.com/kyverno/kyverno-json/pkg/apis/policy/v1alpha1"
 	"github.com/kyverno/kyverno-json/pkg/data"
 	fileinfo "github.com/kyverno/kyverno/ext/file-info"
 	"github.com/kyverno/kyverno/ext/resource/convert"

diff --git a/pkg/policy/load_test.go b/pkg/policy/load_test.go
@@ -4,7 +4,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/kyverno/kyverno-json/pkg/apis/v1alpha1"
+	"github.com/kyverno/kyverno-json/pkg/apis/policy/v1alpha1"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/pkg/server/playground/handler.go b/pkg/server/playground/handler.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/kyverno/kyverno-json/pkg/apis/v1alpha1"
+	"github.com/kyverno/kyverno-json/pkg/apis/policy/v1alpha1"
 	"github.com/kyverno/kyverno-json/pkg/engine/template"
 	jsonengine "github.com/kyverno/kyverno-json/pkg/json-engine"
 	"github.com/kyverno/kyverno-json/pkg/server/model"

diff --git a/pkg/server/scan/config.go b/pkg/server/scan/config.go
@@ -1,7 +1,7 @@
 package scan
 
 import (
-	"github.com/kyverno/kyverno-json/pkg/apis/v1alpha1"
+	"github.com/kyverno/kyverno-json/pkg/apis/policy/v1alpha1"
 )
 
 type PolicyProvider interface {

diff --git a/pkg/server/scan/handler.go b/pkg/server/scan/handler.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/kyverno/kyverno-json/pkg/apis/v1alpha1"
+	"github.com/kyverno/kyverno-json/pkg/apis/policy/v1alpha1"
 	"github.com/kyverno/kyverno-json/pkg/engine/template"
 	jsonengine "github.com/kyverno/kyverno-json/pkg/json-engine"
 	"github.com/kyverno/kyverno-json/pkg/server/model"

diff --git a/website/apis/config.yaml b/website/apis/config.yaml
@@ -38,4 +38,4 @@ apis:
   - name: kyverno-json
     title: KyvernoJson (v1alpha1)
     package: github.com/kyverno/kyverno-json
-    path: pkg/apis/v1alpha1
+    path: pkg/apis/policy/v1alpha1
diff --git a/website/catalog/main.go b/website/catalog/main.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/kyverno/kyverno-json/pkg/apis/v1alpha1"
+	"github.com/kyverno/kyverno-json/pkg/apis/policy/v1alpha1"
 	"github.com/kyverno/kyverno-json/pkg/catalog"
 	"github.com/kyverno/kyverno-json/pkg/policy"
 	fileinfo "github.com/kyverno/kyverno/ext/file-info"