Merge pull request #229 from hyperspike/pivot

clean up for pivot

Makefile

@@ -23,8 +23,8 @@ CONTAINER_TOOL ?= docker
 SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
 
-K8S_VERSION ?= 1.31.2
-CILIUM_VERSION ?= 1.16.3
+K8S_VERSION ?= 1.32.0
+CILIUM_VERSION ?= 1.16.4
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION ?= $(K8S_VERSION)
 

api/v1/gitea_types.go

@@ -51,7 +51,7 @@ type GiteaSpec struct {
 	PrometheusLabels map[string]string `json:"prometheusLabels,omitempty"`
 
 	// Override the operator set image
-	// +kubebuilder:default:="gitea/gitea:1.22.3"
+	// +kubebuilder:default:="gitea/gitea:1.22.6"
 	Image string `json:"image,omitempty"`
 
 	// Use Valkey

config/crd/bases/hyperspike.io_gitea.yaml

@@ -74,7 +74,7 @@ spec:
                 description: Create a loadbalancer for ssh access
                 type: boolean
               image:
-                default: gitea/gitea:1.22.3
+                default: gitea/gitea:1.22.6
                 description: Override the operator set image
                 type: string
               ingress:

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: localhost:5000/controller
-  newTag: "8"
+  newTag: "1"

dist/install.yaml

@@ -11,7 +11,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: auths.hyperspike.io
 spec:
   group: hyperspike.io
@@ -142,7 +142,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: gitea.hyperspike.io
 spec:
   group: hyperspike.io
@@ -213,7 +213,7 @@ spec:
                 description: Create a loadbalancer for ssh access
                 type: boolean
               image:
-                default: gitea/gitea:1.22.3
+                default: gitea/gitea:1.22.6
                 description: Override the operator set image
                 type: string
               ingress:
@@ -349,7 +349,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: orgs.hyperspike.io
 spec:
   group: hyperspike.io
@@ -474,7 +474,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: repoes.hyperspike.io
 spec:
   group: hyperspike.io
@@ -596,7 +596,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: runners.hyperspike.io
 spec:
   group: hyperspike.io
@@ -698,7 +698,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: users.hyperspike.io
 spec:
   group: hyperspike.io
@@ -986,6 +986,13 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
 - apiGroups:
   - ""
   resources:
@@ -1052,13 +1059,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
 - apiGroups:
   - hyperspike.io
   resources:
@@ -1408,7 +1408,7 @@ spec:
         - --health-probe-bind-address=:8081
         command:
         - /manager
-        image: localhost:5000/controller:8
+        image: localhost:5000/controller:1
         livenessProbe:
           httpGet:
             path: /healthz

gitea.yaml

@@ -10,7 +10,7 @@ spec:
   #objectStorage:
   #  type: s3
   certIssuer: selfsigned
-  prometheus: true
+  prometheus: false
   prometheusLabels:
     prometheus: prometheus
   valkey: true
@@ -57,29 +57,30 @@ spec:
   - name: Test
     permission: admin
     includeAllRepos: true
+    createOrgRepo: true
     members:
     - demo
-#---
-#apiVersion: hyperspike.io/v1
-#kind: Repo
-#metadata:
-#  labels:
-#    app.kubernetes.io/name: gitea-operator
-#    app.kubernetes.io/managed-by: kustomize
-#  name: repo-sample
-#spec:
-#  private: true
-#  org:
-#    name: test
-#---
-#apiVersion: hyperspike.io/v1
-#kind: Repo
-#metadata:
-#  labels:
-#    app.kubernetes.io/name: gitea-operator
-#    app.kubernetes.io/managed-by: kustomize
-#  name: two
-#spec:
-#  private: true
-#  org:
-#    name: test
+---
+apiVersion: hyperspike.io/v1
+kind: Repo
+metadata:
+  labels:
+    app.kubernetes.io/name: gitea-operator
+    app.kubernetes.io/managed-by: kustomize
+  name: repo-sample
+spec:
+  private: true
+  org:
+    name: test
+---
+apiVersion: hyperspike.io/v1
+kind: Repo
+metadata:
+  labels:
+    app.kubernetes.io/name: gitea-operator
+    app.kubernetes.io/managed-by: kustomize
+  name: infra
+spec:
+  private: true
+  org:
+    name: test

internal/controller/gitea_controller.go

@@ -182,10 +182,6 @@ func (r *GiteaReconciler) reconcileGitea(ctx context.Context, gitea *hyperv1.Git
 			}
 		}
 	}
-	pgUp, _ := r.pgRunning(ctx, gitea)
-	if !pgUp {
-		return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil
-	}
 	if gitea.Spec.Valkey {
 		if err := r.upsertValkey(ctx, gitea); err != nil {
 			return ctrl.Result{}, err
@@ -195,6 +191,11 @@ func (r *GiteaReconciler) reconcileGitea(ctx context.Context, gitea *hyperv1.Git
 			return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil
 		}
 	}
+	// spool up valkey and postgres in parallel
+	pgUp, _ := r.pgRunning(ctx, gitea)
+	if !pgUp {
+		return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil
+	}
 	if gitea.Spec.TLS {
 		if err := r.upsertCertificate(ctx, gitea); err != nil {
 			return ctrl.Result{}, err
@@ -588,7 +589,7 @@ echo '==== END GITEA CONFIGURATION ===='`,
 	}
 	logger.Info("api is up", "sts", gitea.Name)
 	if err := r.adminToken(ctx, gitea); err != nil {
-		return ctrl.Result{}, err
+		return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil
 	}
 
 	return ctrl.Result{}, nil
@@ -852,11 +853,7 @@ func (r *GiteaReconciler) upsertGiteaSvc(ctx context.Context, gitea *hyperv1.Git
 		TargetPort: intstr.FromString("http"),
 	}
 	if gitea.Spec.TLS {
-		port = corev1.ServicePort{
-			Name:       "http",
-			Port:       443,
-			TargetPort: intstr.FromString("http"),
-		}
+		port.Port = 443
 	}
 	svc := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
@@ -1696,7 +1693,7 @@ func image(gitea *hyperv1.Gitea) string {
 }
 
 func imageSpoon() string {
-	return "localhost:5000/controller:spoon-8"
+	return "ghcr.io/hyperspike/gitea-spoon:v0.0.3"
 }
 
 var vol = map[string]string{
@@ -1861,7 +1858,7 @@ func (r *GiteaReconciler) adminToken(ctx context.Context, gitea *hyperv1.Gitea)
 		return err
 	}
 	tok, ok := secret.Data["token"]
-	if ok && len(tok) != 0 {
+	if ok && len(tok) != 0 && string(tok) != "" {
 		logger.Info("token detected, skipping", "Secret", gitea.Name+"-admin")
 		return nil
 	}
@@ -1905,12 +1902,20 @@ func (r *GiteaReconciler) adminToken(ctx context.Context, gitea *hyperv1.Gitea)
 		logger.Error(err, "failed json unmarshal "+url)
 		return err
 	}
+	if tresp.Token == "" {
+		logger.Error(err, "token not found in response", "response", string(body))
+		return fmt.Errorf("token not found in response")
+	}
 	secret.Data["token"] = []byte(tresp.Token)
 	if err := r.Update(ctx, secret); err != nil {
 		logger.Error(err, "failed to update secret "+gitea.Name+"-admin."+gitea.Namespace)
 		return err
 	}
 	r.Recorder.Event(gitea, "Normal", "Token", fmt.Sprintf("Admin token created added to %s secret", gitea.Name+"-admin"))
+	if err := r.setCondition(ctx, gitea, "ApiToken", "True", "ApiToken", "Api Token Provisioned"); err != nil {
+		logger.Error(err, "Gitea status update failed.")
+		return err
+	}
 
 	return nil
 }
@@ -2180,6 +2185,7 @@ func (r *GiteaReconciler) upsertGiteaSts(ctx context.Context, gitea *hyperv1.Git
 		},
 	}
 	sts.Spec.Template.Spec.InitContainers[2].Env = append(sts.Spec.Template.Spec.InitContainers[2].Env, admins...)
+	sts.Spec.Template.Spec.Containers[1].Env = append(sts.Spec.Template.Spec.Containers[1].Env, admins...)
 	if gitea.Spec.TLS {
 		sts.Spec.Template.Spec.Volumes = append(sts.Spec.Template.Spec.Volumes, corev1.Volume{
 			Name: "tls",