Merge pull request #31 from KusionStack/api-fix

fix: correct pod protection finalizer prefix
KusionStack · Aug 17, 2023 · 2eb9d2e · 2eb9d2e
2 parents becbf99 + ac8c10f
commit 2eb9d2e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/apis/apps/v1alpha1/defaults.go b/apis/apps/v1alpha1/defaults.go
@@ -23,16 +23,15 @@ import (
 	"time"
 
 	dockerref "github.com/docker/distribution/reference"
-	"k8s.io/api/core/v1"
-	corev1 "k8s.io/api/core/v1"
-	utilpointer "k8s.io/utils/pointer"
+	v1 "k8s.io/api/core/v1"
+	utilpointer "k8s.io/utils/ptr"
 )
 
 const (
 	DefaultImageTag = "latest"
 )
 
-func SetDefaults_PodSpec(podSpec *corev1.PodSpec) {
+func SetDefaults_PodSpec(podSpec *v1.PodSpec) {
 	SetDefaults_PodSpecConfig(podSpec)
 	for i := range podSpec.Volumes {
 		a := &podSpec.Volumes[i]

diff --git a/apis/apps/v1alpha1/types.go b/apis/apps/v1alpha1/types.go
@@ -16,13 +16,6 @@ limitations under the License.
 
 package v1alpha1
 
-const (
-	PodOperationProtectionFinalizerPrefix = "prot.lifecycle.kafed.kusionstack.io"
-
-	PodOpsLifecyclePreCheckStage  = "pre-check"
-	PodOpsLifecyclePostCheckStage = "post-check"
-)
-
 // +kubebuilder:object:generate=false
 type PodAvailableConditions struct {
 	ExpectedFinalizers []string `json:"expectedFinalizers,omitempty"` // indicate the expected finalizers of a pod

diff --git a/...ps/v1alpha1/well_known_readiness_gates.go → apis/apps/v1alpha1/well_known_vars.go b/...ps/v1alpha1/well_known_readiness_gates.go → apis/apps/v1alpha1/well_known_vars.go
@@ -16,6 +16,18 @@ limitations under the License.
 
 package v1alpha1
 
+// well known readiness gate
 const (
 	ReadinessGatePodServiceReady = "pod.kusionstack.io/service-ready"
 )
+
+// well known finalizer
+const (
+	PodOperationProtectionFinalizerPrefix = "prot.podopslifecycle.kusionstack.io"
+)
+
+// well known variables
+const (
+	PodOpsLifecyclePreCheckStage  = "pre-check"
+	PodOpsLifecyclePostCheckStage = "post-check"
+)
diff --git a/go.mod b/go.mod
@@ -19,8 +19,8 @@ require (
 	k8s.io/client-go v0.22.6
 	k8s.io/component-base v0.22.6
 	k8s.io/component-helpers v0.0.0-00010101000000-000000000000
-	k8s.io/klog/v2 v2.9.0
-	k8s.io/utils v0.0.0-20211116205334-6203023598ed
+	k8s.io/klog/v2 v2.80.1
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/controller-runtime v0.10.3
 )
 

diff --git a/go.sum b/go.sum
@@ -855,8 +855,8 @@ k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c h1:jvamsI1tn9V0S8jicyX82qaFC0H/NKxv2e5mbqsgR80=
 k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20211116205334-6203023598ed h1:ck1fRPWPJWsMd8ZRFsWc6mh/zHp5fZ/shhbrgPUxDAE=
-k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=