address review comments

Signed-off-by: Manabu Mccloskey <[email protected]>

api/v1alpha1/gitrepository_types.go

@@ -47,9 +47,9 @@ type GitRepositoryStatus struct {
 	// ExternalGitRepositoryUrl is the url for the in-cluster repository accessible from local machine.
 	// +kubebuilder:validation:Optional
 	ExternalGitRepositoryUrl string `json:"externalGitRepositoryUrl"`
-	// GitRepositoryUrl is the url for the in-cluster repository accessible within the cluster.
+	// InternalGitRepositoryUrl is the url for the in-cluster repository accessible within the cluster.
 	// +kubebuilder:validation:Optional
-	GitRepositoryUrl string `json:"gitRepositoryUrl"`
+	InternalGitRepositoryUrl string `json:"internalGitRepositoryUrl"`
 	// Path is the path within the repository that contains the files.
 	// +kubebuilder:validation:Optional
 	Path string `json:"path"`

api/v1alpha1/localbuild_types.go

@@ -39,13 +39,10 @@ type LocalbuildSpec struct {
 type LocalbuildStatus struct {
 	// ObservedGeneration is the 'Generation' of the Service that was last processed by the controller.
 	// +optional
-	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
-
-	GitServerAvailable bool        `json:"gitServerAvailable,omitempty"`
-	ArgoAvailable      bool        `json:"argoAvailable,omitempty"`
-	NginxAvailable     bool        `json:"nginxAvailable,omitempty"`
-	ArgoAppsCreated    bool        `json:"argoAppsCreated,omitempty"`
-	Gitea              GiteaStatus `json:"giteaStatus,omitempty"`
+	ObservedGeneration int64        `json:"observedGeneration,omitempty"`
+	ArgoCD             ArgoCDStatus `json:"ArgoCD,omitempty"`
+	Nginx              NginxStatus  `json:"nginx,omitempty"`
+	Gitea              GiteaStatus  `json:"gitea,omitempty"`
 }
 
 type GiteaStatus struct {
@@ -56,6 +53,15 @@ type GiteaStatus struct {
 	AdminUserSecretNamespace string `json:"adminUserSecretNamespace,omitempty"`
 }
 
+type ArgoCDStatus struct {
+	Available   bool `json:"available,omitempty"`
+	AppsCreated bool `json:"appsCreated,omitempty"`
+}
+
+type NginxStatus struct {
+	Available bool `json:"available,omitempty"`
+}
+
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:path=localbuilds,scope=Cluster

pkg/controllers/gitrepository/controller.go

@@ -30,7 +30,7 @@ const (
 	giteaAdminPasswordKey = "password"
 	requeueTime           = time.Second * 30
 	gitCommitAuthorName   = "git-reconciler"
-	gitCommitAuthorEmail  = "invalid@cnoe.io"
+	gitCommitAuthorEmail  = "idpbuilder-agent@cnoe.io"
 )
 
 type GiteaClientFunc func(url string, options ...gitea.ClientOption) (GiteaClient, error)
@@ -235,7 +235,6 @@ func reconcileRepo(giteaClient GiteaClient, repo *v1alpha1.GitRepository) (*gite
 			if CErr != nil {
 				return &gitea.Repository{}, fmt.Errorf("failed to create git repository: %w", CErr)
 			}
-			repo.Status.ExternalGitRepositoryUrl = createResp.CloneURL
 			return createResp, nil
 		}
 	}

pkg/controllers/gitrepository/controller_test.go

@@ -96,7 +96,7 @@ func setUpLocalRepo() (string, string, error) {
 	fileObject.SetType(plumbing.BlobObject)
 	w, _ := fileObject.Writer()
 
-	file, err := os.ReadFile("resources/file1")
+	file, err := os.ReadFile("test/resources/file1")
 	if err != nil {
 		return "", "", fmt.Errorf("reading file from resources dir: %w", err)
 	}
@@ -146,7 +146,7 @@ func setupDir() (string, error) {
 		return "", fmt.Errorf("creating temporary directory: %w", err)
 	}
 
-	file, err := os.ReadFile("resources/file1")
+	file, err := os.ReadFile("test/resources/file1")
 	if err != nil {
 		return "", fmt.Errorf("reading file from resources dir: %w", err)
 	}
@@ -283,7 +283,7 @@ func TestGitRepositoryReconcile(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed setting up local git repo: %v", err)
 	}
-	resourcePath, err := filepath.Abs("./resources")
+	resourcePath, err := filepath.Abs("./test/resources")
 	if err != nil {
 		t.Fatalf("failed to get absolute path: %v", err)
 	}

pkg/controllers/localbuild/argo.go

@@ -51,6 +51,6 @@ func (r *LocalbuildReconciler) ReconcileArgo(ctx context.Context, req ctrl.Reque
 		return result, err
 	}
 
-	resource.Status.ArgoAvailable = true
+	resource.Status.ArgoCD.Available = true
 	return ctrl.Result{}, nil
 }

pkg/controllers/localbuild/controller.go

@@ -141,7 +141,7 @@ func (r *LocalbuildReconciler) ReconcileEmbeddedGitServer(ctx context.Context, r
 	log := log.FromContext(ctx)
 
 	// Bail if argo is not yet available
-	if !resource.Status.ArgoAvailable {
+	if !resource.Status.ArgoCD.Available {
 		log.Info("argo not yet available, not installing embedded git server")
 		return ctrl.Result{}, nil
 	}
@@ -265,7 +265,7 @@ func (r *LocalbuildReconciler) ReconcileArgoAppsWithGitServer(ctx context.Contex
 		}
 	}
 
-	resource.Status.ArgoAppsCreated = true
+	resource.Status.ArgoCD.AppsCreated = true
 	r.shouldShutdown = true
 
 	return ctrl.Result{}, nil

pkg/controllers/localbuild/nginx.go

@@ -40,6 +40,6 @@ func (r *LocalbuildReconciler) ReconcileNginx(ctx context.Context, req ctrl.Requ
 		return result, err
 	}
 
-	resource.Status.NginxAvailable = true
+	resource.Status.Nginx.Available = true
 	return ctrl.Result{}, nil
 }

pkg/controllers/resources/idpbuilder.cnoe.io_gitrepositories.yaml

@@ -89,9 +89,9 @@ spec:
                 description: ExternalGitRepositoryUrl is the url for the in-cluster
                   repository accessible from local machine.
                 type: string
-              gitRepositoryUrl:
-                description: GitRepositoryUrl is the url for the in-cluster repository
-                  accessible within the cluster.
+              internalGitRepositoryUrl:
+                description: InternalGitRepositoryUrl is the url for the in-cluster
+                  repository accessible within the cluster.
                 type: string
               path:
                 description: Path is the path within the repository that contains

pkg/controllers/resources/idpbuilder.cnoe.io_localbuilds.yaml

@@ -64,13 +64,14 @@ spec:
             type: object
           status:
             properties:
-              argoAppsCreated:
-                type: boolean
-              argoAvailable:
-                type: boolean
-              gitServerAvailable:
-                type: boolean
-              giteaStatus:
+              ArgoCD:
+                properties:
+                  appsCreated:
+                    type: boolean
+                  available:
+                    type: boolean
+                type: object
+              gitea:
                 properties:
                   adminUserSecretNameecret:
                     type: string
@@ -83,8 +84,11 @@ spec:
                   internalURL:
                     type: string
                 type: object
-              nginxAvailable:
-                type: boolean
+              nginx:
+                properties:
+                  available:
+                    type: boolean
+                type: object
               observedGeneration:
                 description: ObservedGeneration is the 'Generation' of the Service
                   that was last processed by the controller.