server-manager/kubernetes-operator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added command and args to status
Some checks failed
Build and Push Docker Image / Build image (push) Has been cancelled
Details

Browse Source
This commit is contained in:
ACoolName
2025-04-05 22:35:43 +03:00
parent 39f1c0d92c
commit 7ef824830e
5 changed files with 109 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/v1alpha1/servermanager_types.go
View File

@@ -44,6 +44,8 @@ type ServerStatus struct {
Domain string `json:"domain,omitempty"` Domain string `json:"domain,omitempty"`
Running bool `json:"running,omitempty"` Running bool `json:"running,omitempty"`
HostPorts []PortMapping `json:"host_ports,omitempty"` HostPorts []PortMapping `json:"host_ports,omitempty"`
Args []string `json:"args,omitempty"`
Command []string `json:"command,omitempty"`
} }
type ServerSpec struct { type ServerSpec struct {

10
api/v1alpha1/zz_generated.deepcopy.go
View File

@@ -333,6 +333,16 @@ func (in *ServerStatus) DeepCopyInto(out *ServerStatus) {
*out = make([]PortMapping, len(*in)) *out = make([]PortMapping, len(*in))
copy(*out, *in) copy(*out, *in)
} }
if in.Args != nil {
in, out := &in.Args, &out.Args
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.Command != nil {
in, out := &in.Command, &out.Command
*out = make([]string, len(*in))
copy(*out, *in)
}
} }
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServerStatus. // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServerStatus.

8
config/crd/bases/server-manager.acooldomain.co_servermanagers.yaml
View File

@@ -94,6 +94,14 @@ spec:
INSERT ADDITIONAL STATUS FIELD - define observed state of cluster INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
Important: Run "make" to regenerate code after modifying this file Important: Run "make" to regenerate code after modifying this file
properties: properties:
args:
items:
type: string
type: array
command:
items:
type: string
type: array
domain: domain:
type: string type: string
host_ports: host_ports:

142
config/rbac/role.yaml
View File

@@ -2,81 +2,69 @@
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: server-manager-role name: manager-role
rules: rules:
- resources: - resources:
- persistentvolumeclaims - persistentvolumeclaims
- services - services
verbs: verbs:
- create - create
- delete - delete
- get - get
- list - list
- patch - patch
- update - update
- watch - watch
apiGroups: - resources:
- "" - pods
- resources: verbs:
- pods - create
verbs: - delete
- create - get
- delete - list
- get - watch
- list - apiGroups:
- watch - server-manager.acooldomain.co
apiGroups: resources:
- "" - images
- apiGroups: verbs:
- "" - get
resources: - list
- nodes - apiGroups:
verbs: - server-manager.acooldomain.co
- get resources:
- list - servermanagers
- apiGroups: verbs:
- server-manager.acooldomain.co - create
resources: - delete
- images - get
verbs: - list
- get - patch
- list - update
- watch - watch
- apiGroups: - apiGroups:
- server-manager.acooldomain.co - server-manager.acooldomain.co
resources: resources:
- servermanagers - servermanagers/finalizers
verbs: verbs:
- create - update
- delete - apiGroups:
- get - server-manager.acooldomain.co
- list resources:
- patch - servermanagers/status
- update verbs:
- watch - get
- apiGroups: - patch
- server-manager.acooldomain.co - update
resources: - apiGroups:
- servermanagers/finalizers - traefik.io
verbs: resources:
- update - ingressroutes
- apiGroups: verbs:
- server-manager.acooldomain.co - create
resources: - delete
- servermanagers/status - get
verbs: - list
- get - patch
- patch - update
- update - watch
- apiGroups:
- traefik.io
resources:
- ingressroutes
verbs:
- create
- delete
- get
- list
- patch
- update
- watch

24
internal/controller/servermanager_controller.go
View File

@@ -185,11 +185,27 @@ func (r *ServerManagerReconciler) Reconcile(ctx context.Context, req ctrl.Reques
s.Status.Server.Running = true s.Status.Server.Running = true
statusChanged = true statusChanged = true
} }
if s.Status.Server.Command == nil {
s.Status.Server.Command = serverPod.Spec.Containers[0].Command
statusChanged = true
}
if s.Status.Server.Args == nil {
s.Status.Server.Args = serverPod.Spec.Containers[0].Args
statusChanged = true
}
default: default:
if s.Status.Server.Running { if s.Status.Server.Running {
s.Status.Server.Running = false s.Status.Server.Running = false
statusChanged = true statusChanged = true
} }
if len(s.Status.Server.Args) != 0 {
s.Status.Server.Args = nil
statusChanged = true
}
if len(s.Status.Server.Command) != 0 {
s.Status.Server.Command = nil
statusChanged = true
}
} }
} }
@@ -198,6 +214,14 @@ func (r *ServerManagerReconciler) Reconcile(ctx context.Context, req ctrl.Reques
s.Status.Server.Running = false s.Status.Server.Running = false
statusChanged = true statusChanged = true
} }
if len(s.Status.Server.Args) != 0 {
s.Status.Server.Args = nil
statusChanged = true
}
if len(s.Status.Server.Command) != 0 {
s.Status.Server.Command = nil
statusChanged = true
}
} }
logging.Info("verified pod") logging.Info("verified pod")