Merge pull request #1724 from fluxcd/fix-codegen

fix: fix codegen script and update generated code

Author: stefanprodan

hack/update-codegen.sh

@@ -34,14 +34,16 @@ mkdir -p "${TEMP_DIR}/${PACKAGE_PATH_BASE}/pkg/client/informers" \
 # Ensure we can execute.
 chmod +x ${CODEGEN_PKG}/kube_codegen.sh
 
-source ${CODEGEN_PKG}/kube_codegen.sh kube::codegen::gen_client \
-    --output-dir "${TEMP_DIR}" \
+source ${CODEGEN_PKG}/kube_codegen.sh
+
+kube::codegen::gen_client \
+    --output-dir "${TEMP_DIR}/${PACKAGE_PATH_BASE}/pkg/client" \
     --output-pkg "${PACKAGE_PATH_BASE}/pkg/client" \
     --with-watch \
     --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \
-    ./pkgs/apis
+    ./pkg/apis
 
-ls -lha $TEMP_DIR
+tree $TEMP_DIR/${PACKAGE_PATH_BASE/pkg/client}/
 
 # Copy everything back.
 cp -r "${TEMP_DIR}/${PACKAGE_PATH_BASE}/." "${SCRIPT_ROOT}/"

pkg/apis/gloo/register.go

@@ -1,6 +1,5 @@
 package gloo
 
 const (
-	GlooGroupName    = "gloo.solo.io"
-	GatewayGroupName = "gateway.solo.io"
+	GlooGroupName = "gloo.solo.io"
 )

pkg/apis/gloo/gloo/v1/doc.go pkg/apis/gloo/v1/doc.go

@@ -1,7 +1,6 @@
 package v1
 
 import (
-	v1 "github.com/fluxcd/flagger/pkg/apis/gloo/gateway/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -44,7 +43,7 @@ type UpstreamSslConfig struct {
 
 	/** SSLSecrets -- only one of these should be set */
 	*UpstreamSslConfig_Sds      `json:"sds,omitempty"`
-	SecretRef                   *v1.ResourceRef `json:"secretRef,omitempty"`
+	SecretRef                   *ResourceRef `json:"secretRef,omitempty"`
 	*UpstreamSslConfig_SslFiles `json:"sslFiles,omitempty"`
 }
 
@@ -139,3 +138,9 @@ type UpstreamList struct {
 
 	Items []Upstream `json:"items"`
 }
+
+// ResourceRef references resources across namespaces
+type ResourceRef struct {
+	Name      string `json:"name,omitempty"`
+	Namespace string `json:"namespace,omitempty"`
+}

pkg/apis/gloo/gloo/v1/register.go pkg/apis/gloo/v1/register.go

@@ -0,0 +1,5 @@
+package gloogateway
+
+const (
+	GatewayGroupName = "gateway.solo.io"
+)

pkg/apis/gloo/gloo/v1/types.go pkg/apis/gloo/v1/types.go

@@ -1,14 +1,14 @@
 package v1
 
 import (
-	"github.com/fluxcd/flagger/pkg/apis/gloo"
+	"github.com/fluxcd/flagger/pkg/apis/gloogateway"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // SchemeGroupVersion is group version used to register these objects
-var SchemeGroupVersion = schema.GroupVersion{Group: gloo.GatewayGroupName, Version: "v1"}
+var SchemeGroupVersion = schema.GroupVersion{Group: gloogateway.GatewayGroupName, Version: "v1"}
 
 // Kind takes an unqualified kind and returns back a Group qualified GroupKind
 func Kind(kind string) schema.GroupKind {