Fix issues with codegen

I noticed that codegen wasn't creating a generated folder, then
saw that I'd used the folder "client" instead of "generated".

Thanks to @stefanprodan for spotting some additional errors with
the codegen.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

controller.go

@@ -334,7 +334,7 @@ func (c *Controller) syncHandler(key string) error {
 
 	if service != nil {
 		if service.Spec.Type == "LoadBalancer" {
-			tunnels := c.operatorclientset.InletsoperatorV1alpha1().
+			tunnels := c.operatorclientset.InletsV1alpha1().
 				Tunnels(service.ObjectMeta.Namespace)
 
 			ops := metav1.GetOptions{}
@@ -746,7 +746,7 @@ func (c *Controller) syncHandler(key string) error {
 				Namespace: deployment.Namespace,
 			}
 
-			_, updateErr := c.operatorclientset.InletsoperatorV1alpha1().
+			_, updateErr := c.operatorclientset.InletsV1alpha1().
 				Tunnels(tunnel.Namespace).
 				Update(tunnel)
 
@@ -892,7 +892,7 @@ func (c *Controller) updateTunnelProvisioningStatus(tunnel *inletsv1alpha1.Tunne
 	tunnelCopy.Status.HostID = id
 	tunnelCopy.Status.HostIP = ip
 
-	_, err := c.operatorclientset.InletsoperatorV1alpha1().Tunnels(tunnel.Namespace).Update(tunnelCopy)
+	_, err := c.operatorclientset.InletsV1alpha1().Tunnels(tunnel.Namespace).Update(tunnelCopy)
 	return err
 }
 

hack/update-codegen.sh

@@ -31,10 +31,10 @@ echo ">> Temporary output directory ${TEMP_DIR}"
 chmod +x ${CODEGEN_PKG}/generate-groups.sh
 
 ${CODEGEN_PKG}/generate-groups.sh all \
-    github.com/inlets/inlets-operator/pkg/client github.com/inlets/inlets-operator/pkg/apis \
+    github.com/inlets/inlets-operator/pkg/generated github.com/inlets/inlets-operator/pkg/apis \
     inletsoperator:v1alpha1 \
     --output-base "${TEMP_DIR}" \
     --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
 
 # Copy everything back.
-cp -r "${TEMP_DIR}/github.com/inlets/inlets-operator/." "${SCRIPT_ROOT}/"
+cp -r "${TEMP_DIR}/github.com/inlets/inlets-operator/." "${SCRIPT_ROOT}/"

main.go

@@ -117,7 +117,7 @@ func main() {
 
 	controller := NewController(kubeClient, operatorClient,
 		kubeInformerFactory.Apps().V1().Deployments(),
-		tunnelsInformerFactory.Inletsoperator().V1alpha1().Tunnels(),
+		tunnelsInformerFactory.Inlets().V1alpha1().Tunnels(),
 		kubeInformerFactory.Core().V1().Services(),
 		infra)
 

pkg/apis/inletsoperator/v1alpha1/doc.go

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
-// +groupName=inletsoperator.k8s.io
+// +groupName=inlets.inlets.dev
 
 // Package v1alpha1 is the v1alpha1 version of the API.
 package v1alpha1