feat: fix delete

This commit is contained in:
cdryzun 2023-09-05 19:05:08 +08:00
parent 978f5ab231
commit c20a316026
2 changed files with 23 additions and 3 deletions

View File

@ -56,9 +56,8 @@ type AppServiceStatus struct {
type AppService struct { type AppService struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"` metav1.ObjectMeta `json:"metadata,omitempty"`
Spec AppServiceSpec `json:"spec,omitempty"`
Spec AppServiceSpec `json:"spec,omitempty"` Status AppServiceStatus `json:"status,omitempty"`
Status AppServiceStatus `json:"status,omitempty"`
} }
//+kubebuilder:object:root=true //+kubebuilder:object:root=true

View File

@ -27,6 +27,7 @@ import (
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
ctrl "sigs.k8s.io/controller-runtime" ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log"
@ -158,6 +159,16 @@ func NewDeploy(instance *apptreesirpubv1alpha1.AppService) *appsv1.Deployment {
Name: instance.Name, Name: instance.Name,
Namespace: instance.Namespace, Namespace: instance.Namespace,
Labels: labels, Labels: labels,
OwnerReferences: []metav1.OwnerReference{
*metav1.NewControllerRef(
instance,
schema.GroupVersionKind{
Group: apptreesirpubv1alpha1.SchemeBuilder.GroupVersion.Group,
Version: apptreesirpubv1alpha1.SchemeBuilder.GroupVersion.Version,
Kind: "AppService",
},
),
},
}, },
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Replicas: instance.Spec.Size, Replicas: instance.Spec.Size,
@ -185,6 +196,16 @@ func NewService(instance *apptreesirpubv1alpha1.AppService) *corev1.Service {
Name: instance.Name, Name: instance.Name,
Namespace: instance.Namespace, Namespace: instance.Namespace,
Labels: labels, Labels: labels,
OwnerReferences: []metav1.OwnerReference{
*metav1.NewControllerRef(
instance,
schema.GroupVersionKind{
Group: apptreesirpubv1alpha1.SchemeBuilder.GroupVersion.Group,
Version: apptreesirpubv1alpha1.SchemeBuilder.GroupVersion.Version,
Kind: "AppService",
},
),
},
}, },
Spec: corev1.ServiceSpec{ Spec: corev1.ServiceSpec{
Type: corev1.ServiceTypeNodePort, Type: corev1.ServiceTypeNodePort,