fix devbox get runtime. (#5030)

Signed-off-by: yy <[email protected]>
labring · Sep 3, 2024 · 4e13ab5 · 4e13ab5
1 parent 306bbda
commit 4e13ab5
Show file tree

Hide file tree

Showing 9 changed files with 281 additions and 236 deletions.
diff --git a/controllers/devbox/api/v1alpha1/devbox_types.go b/controllers/devbox/api/v1alpha1/devbox_types.go
@@ -54,6 +54,8 @@ type ResourceList map[ResourceName]resource.Quantity
 type RuntimeRef struct {
 	// +kubebuilder:validation:Required
 	Name string `json:"name"`
+	// +kubebuilder:validation:Required
+	Namespace string `json:"namespace"`
 }
 
 type NetworkSpec struct {

diff --git a/controllers/devbox/api/v1alpha1/devboxrelease_types.go b/controllers/devbox/api/v1alpha1/devboxrelease_types.go
@@ -41,6 +41,10 @@ const (
 	DevboxReleasePhaseFailed DevboxReleasePhase = "Failed"
 )
 
+// +kubebuilder:printcolumn:name="DevboxName",type="string",JSONPath=".spec.devboxName"
+// +kubebuilder:printcolumn:name="NewTag",type="string",JSONPath=".spec.newTag"
+// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase"
+
 // DevBoxReleaseStatus defines the observed state of DevBoxRelease
 type DevBoxReleaseStatus struct {
 	// +kubebuilder:validation:Optional

diff --git a/controllers/devbox/config/crd/bases/devbox.sealos.io_devboxes.yaml b/controllers/devbox/config/crd/bases/devbox.sealos.io_devboxes.yaml
diff --git a/controllers/devbox/config/crd/bases/devbox.sealos.io_runtimes.yaml b/controllers/devbox/config/crd/bases/devbox.sealos.io_runtimes.yaml
diff --git a/controllers/devbox/config/rbac/role.yaml b/controllers/devbox/config/rbac/role.yaml
@@ -21,15 +21,15 @@ rules:
 - apiGroups:
   - ""
   resources:
-    - events
+  - events
   verbs:
-    - '*'
+  - '*'
 - apiGroups:
-    - ""
+  - ""
   resources:
-    - pods
+  - pods
   verbs:
-    - '*'
+  - '*'
 - apiGroups:
   - ""
   resources:
@@ -43,13 +43,13 @@ rules:
   resources:
   - secrets
   verbs:
-    - '*'
+  - '*'
 - apiGroups:
   - ""
   resources:
   - services
   verbs:
-    - '*'
+  - '*'
 - apiGroups:
   - devbox.sealos.io
   resources:
@@ -103,26 +103,26 @@ rules:
   - patch
   - update
 - apiGroups:
-    - devbox.sealos.io
+  - devbox.sealos.io
   resources:
-    - runtimeclasses
+  - runtimeclasses
   verbs:
-    - create
-    - delete
-    - get
-    - list
-    - patch
-    - update
-    - watch
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
-    - devbox.sealos.io
+  - devbox.sealos.io
   resources:
-    - runtimes
+  - runtimes
   verbs:
-    - create
-    - delete
-    - get
-    - list
-    - patch
-    - update
-    - watch
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
diff --git a/controllers/devbox/config/samples/devbox_v1alpha1_runtime.yaml b/controllers/devbox/config/samples/devbox_v1alpha1_runtime.yaml
@@ -16,12 +16,13 @@ apiVersion: devbox.sealos.io/v1alpha1
 kind: Runtime
 metadata:
   name: go-1-22-5
+  namespace: devbox-system
 spec:
   classRef: go
   title: go1.22.5
   description: go1.22.5
   config:
-    image: ghcr.io/cbluebird/devbox/go1.22.5:9259f1
+    image: ghcr.io/cbluebird/devbox/go1.22.5:2f4067
   category:
     - ubuntu
     - go
@@ -30,12 +31,13 @@ apiVersion: devbox.sealos.io/v1alpha1
 kind: Runtime
 metadata:
   name: go-1-23-0
+  namespace: devbox-system
 spec:
   classRef: go
   title: go1.23.0
   description: go1.23.0
   config:
-    image: ghcr.io/cbluebird/devbox/go1.23.0:9259f1
+    image: ghcr.io/cbluebird/devbox/go1.23.0:2f4067
   category:
     - ubuntu
     - go
@@ -44,12 +46,13 @@ apiVersion: devbox.sealos.io/v1alpha1
 kind: Runtime
 metadata:
   name: gin
+  namespace: devbox-system
 spec:
   classRef: gin
   title: gin
   description: gin
   config:
-    image: ghcr.io/cbluebird/devbox/gin:9259f1
+    image: ghcr.io/cbluebird/devbox/gin:2f4067
   category:
     - ubuntu
     - go
@@ -59,12 +62,13 @@ apiVersion: devbox.sealos.io/v1alpha1
 kind: Runtime
 metadata:
   name: spring-boot
+  namespace: devbox-system
 spec:
   classRef: spring-boot
   title: Spring Boot
   description: Spring Boot
   config:
-    image: ghcr.io/cbluebird/devbox/spring-boot:9259f1
+    image: ghcr.io/cbluebird/devbox/spring-boot:2f4067
   category:
     - ubuntu
     - java

diff --git a/controllers/devbox/config/samples/devbox_v1alpha1_runtimeclass.yaml b/controllers/devbox/config/samples/devbox_v1alpha1_runtimeclass.yaml
@@ -16,6 +16,7 @@ apiVersion: devbox.sealos.io/v1alpha1
 kind: RuntimeClass
 metadata:
   name: go
+  namespace: devbox-system
 spec:
   kind: Language
   title: go
@@ -25,6 +26,7 @@ apiVersion: devbox.sealos.io/v1alpha1
 kind: RuntimeClass
 metadata:
   name: gin
+  namespace: devbox-system
 spec:
   kind: Framework
   title: gin
@@ -34,6 +36,7 @@ apiVersion: devbox.sealos.io/v1alpha1
 kind: RuntimeClass
 metadata:
   name: java
+  namespace: devbox-system
 spec:
   kind: Language
   title: java
@@ -43,6 +46,7 @@ apiVersion: devbox.sealos.io/v1alpha1
 kind: RuntimeClass
 metadata:
   name: spring-boot
+  namespace: devbox-system
 spec:
   kind: Framework
   title: Spring Boot
@@ -52,6 +56,7 @@ apiVersion: devbox.sealos.io/v1alpha1
 kind: RuntimeClass
 metadata:
   name: python
+  namespace: devbox-system
 spec:
   kind: Language
   title: python
@@ -61,6 +66,7 @@ apiVersion: devbox.sealos.io/v1alpha1
 kind: RuntimeClass
 metadata:
   name: nodejs
+  namespace: devbox-system
 spec:
   kind: Language
   title: node.js

diff --git a/controllers/devbox/deploy/manifests/deploy.yaml.tmpl b/controllers/devbox/deploy/manifests/deploy.yaml.tmpl
@@ -2673,8 +2673,11 @@ spec:
                 properties:
                   name:
                     type: string
+                  namespace:
+                    type: string
                 required:
                 - name
+                - namespace
                 type: object
               squash:
                 default: false
@@ -2725,7 +2728,6 @@ spec:
               workingDir:
                 type: string
             required:
-            - network
             - resource
             - runtimeRef
             - state
@@ -5093,6 +5095,30 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - devbox.sealos.io
+  resources:
+  - runtimeclasses
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - devbox.sealos.io
+  resources:
+  - runtimes
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/controllers/devbox/internal/controller/devbox_controller.go b/controllers/devbox/internal/controller/devbox_controller.go
@@ -198,7 +198,7 @@ func (r *DevboxReconciler) syncPod(ctx context.Context, devbox *devboxv1alpha1.D
 		return fmt.Errorf("more than one pod found")
 	}
 	runtime := &devboxv1alpha1.Runtime{}
-	if err := r.Get(ctx, client.ObjectKey{Namespace: devbox.Namespace, Name: devbox.Spec.RuntimeRef.Name}, runtime); err != nil {
+	if err := r.Get(ctx, client.ObjectKey{Namespace: devbox.Spec.RuntimeRef.Namespace, Name: devbox.Spec.RuntimeRef.Name}, runtime); err != nil {
 		return err
 	}