feat: kubesphere 4.0 (#6115)
* feat: kubesphere 4.0 Signed-off-by: ci-bot <ci-bot@kubesphere.io> * feat: kubesphere 4.0 Signed-off-by: ci-bot <ci-bot@kubesphere.io> --------- Signed-off-by: ci-bot <ci-bot@kubesphere.io> Co-authored-by: ks-ci-bot <ks-ci-bot@example.com> Co-authored-by: joyceliu <joyceliu@yunify.com>
This commit is contained in:
KubeSphere CI Bot
committed by
GitHub
GitHub
parent
b5015ec7b9
commit
447a51f08b
@@ -1,18 +1,7 @@
|
||||
/*
|
||||
Copyright 2019 The KubeSphere Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
* Please refer to the LICENSE file in the root directory of the project.
|
||||
* https://github.com/kubesphere/kubesphere/blob/master/LICENSE
|
||||
*/
|
||||
|
||||
package k8sutil
|
||||
|
||||
@@ -20,9 +9,7 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/client-go/rest"
|
||||
"k8s.io/client-go/tools/clientcmd"
|
||||
|
||||
tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1"
|
||||
tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2"
|
||||
tenantv1beta1 "kubesphere.io/api/tenant/v1beta1"
|
||||
)
|
||||
|
||||
// IsControlledBy returns whether the ownerReferences contains the specified resource kind
|
||||
@@ -39,8 +26,8 @@ func IsControlledBy(ownerReferences []metav1.OwnerReference, kind string, name s
|
||||
func RemoveWorkspaceOwnerReference(ownerReferences []metav1.OwnerReference) []metav1.OwnerReference {
|
||||
tmp := make([]metav1.OwnerReference, 0)
|
||||
for _, owner := range ownerReferences {
|
||||
if owner.Kind != tenantv1alpha1.ResourceKindWorkspace &&
|
||||
owner.Kind != tenantv1alpha2.ResourceKindWorkspaceTemplate {
|
||||
if owner.Kind != tenantv1beta1.ResourceKindWorkspace &&
|
||||
owner.Kind != tenantv1beta1.ResourceKindWorkspaceTemplate {
|
||||
tmp = append(tmp, owner)
|
||||
}
|
||||
}
|
||||
@@ -50,8 +37,8 @@ func RemoveWorkspaceOwnerReference(ownerReferences []metav1.OwnerReference) []me
|
||||
// GetWorkspaceOwnerName return workspace kind owner name
|
||||
func GetWorkspaceOwnerName(ownerReferences []metav1.OwnerReference) string {
|
||||
for _, owner := range ownerReferences {
|
||||
if owner.Kind == tenantv1alpha1.ResourceKindWorkspace ||
|
||||
owner.Kind == tenantv1alpha2.ResourceKindWorkspaceTemplate {
|
||||
if owner.Kind == tenantv1beta1.ResourceKindWorkspace ||
|
||||
owner.Kind == tenantv1beta1.ResourceKindWorkspaceTemplate {
|
||||
return owner.Name
|
||||
}
|
||||
}
|
||||
@@ -72,3 +59,22 @@ func LoadKubeConfigFromBytes(kubeconfig []byte) (*rest.Config, error) {
|
||||
|
||||
return config, nil
|
||||
}
|
||||
|
||||
func GetObjectMeta(obj metav1.Object) metav1.ObjectMeta {
|
||||
return metav1.ObjectMeta{
|
||||
Name: obj.GetName(),
|
||||
GenerateName: obj.GetGenerateName(),
|
||||
Namespace: obj.GetNamespace(),
|
||||
UID: obj.GetUID(),
|
||||
ResourceVersion: obj.GetResourceVersion(),
|
||||
Generation: obj.GetGeneration(),
|
||||
CreationTimestamp: obj.GetCreationTimestamp(),
|
||||
DeletionTimestamp: obj.GetDeletionTimestamp(),
|
||||
DeletionGracePeriodSeconds: obj.GetDeletionGracePeriodSeconds(),
|
||||
Labels: obj.GetLabels(),
|
||||
Annotations: obj.GetAnnotations(),
|
||||
OwnerReferences: obj.GetOwnerReferences(),
|
||||
Finalizers: obj.GetFinalizers(),
|
||||
ManagedFields: obj.GetManagedFields(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +1,7 @@
|
||||
/*
|
||||
|
||||
Copyright 2020 The KubeSphere Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
*/
|
||||
* Please refer to the LICENSE file in the root directory of the project.
|
||||
* https://github.com/kubesphere/kubesphere/blob/master/LICENSE
|
||||
*/
|
||||
|
||||
package k8sutil
|
||||
|
||||
@@ -22,10 +9,10 @@ import (
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"kubesphere.io/api/tenant/v1beta1"
|
||||
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1"
|
||||
)
|
||||
|
||||
func TestIsControlledBy(t *testing.T) {
|
||||
@@ -43,11 +30,11 @@ func TestIsControlledBy(t *testing.T) {
|
||||
name: "controlled by Workspace",
|
||||
args: args{
|
||||
ownerReferences: []metav1.OwnerReference{{
|
||||
APIVersion: tenantv1alpha1.SchemeGroupVersion.String(),
|
||||
Kind: tenantv1alpha1.ResourceKindWorkspace,
|
||||
APIVersion: v1beta1.SchemeGroupVersion.String(),
|
||||
Kind: v1beta1.ResourceKindWorkspace,
|
||||
Name: "workspace-test",
|
||||
}},
|
||||
kind: tenantv1alpha1.ResourceKindWorkspace,
|
||||
kind: v1beta1.ResourceKindWorkspace,
|
||||
},
|
||||
want: true,
|
||||
},
|
||||
@@ -55,11 +42,11 @@ func TestIsControlledBy(t *testing.T) {
|
||||
name: "controlled by workspace-test",
|
||||
args: args{
|
||||
ownerReferences: []metav1.OwnerReference{{
|
||||
APIVersion: tenantv1alpha1.SchemeGroupVersion.String(),
|
||||
Kind: tenantv1alpha1.ResourceKindWorkspace,
|
||||
APIVersion: v1beta1.SchemeGroupVersion.String(),
|
||||
Kind: v1beta1.ResourceKindWorkspace,
|
||||
Name: "workspace-test",
|
||||
}},
|
||||
kind: tenantv1alpha1.ResourceKindWorkspace,
|
||||
kind: v1beta1.ResourceKindWorkspace,
|
||||
name: "workspace-test",
|
||||
},
|
||||
want: true,
|
||||
@@ -68,11 +55,11 @@ func TestIsControlledBy(t *testing.T) {
|
||||
name: "not controlled by workspace-test",
|
||||
args: args{
|
||||
ownerReferences: []metav1.OwnerReference{{
|
||||
APIVersion: tenantv1alpha1.SchemeGroupVersion.String(),
|
||||
Kind: tenantv1alpha1.ResourceKindWorkspace,
|
||||
APIVersion: v1beta1.SchemeGroupVersion.String(),
|
||||
Kind: v1beta1.ResourceKindWorkspace,
|
||||
Name: "workspace",
|
||||
}},
|
||||
kind: tenantv1alpha1.ResourceKindWorkspace,
|
||||
kind: v1beta1.ResourceKindWorkspace,
|
||||
name: "workspace-test",
|
||||
},
|
||||
want: false,
|
||||
@@ -99,8 +86,8 @@ func TestRemoveWorkspaceOwnerReference(t *testing.T) {
|
||||
{
|
||||
name: "remove workspace owner reference",
|
||||
args: args{ownerReferences: []metav1.OwnerReference{{
|
||||
APIVersion: tenantv1alpha1.SchemeGroupVersion.String(),
|
||||
Kind: tenantv1alpha1.ResourceKindWorkspace,
|
||||
APIVersion: v1beta1.SchemeGroupVersion.String(),
|
||||
Kind: v1beta1.ResourceKindWorkspace,
|
||||
Name: "workspace-test",
|
||||
}}},
|
||||
want: []metav1.OwnerReference{},
|
||||
|
||||
20
pkg/utils/k8sutil/version.go
Normal file
20
pkg/utils/k8sutil/version.go
Normal file
@@ -0,0 +1,20 @@
|
||||
/*
|
||||
* Please refer to the LICENSE file in the root directory of the project.
|
||||
* https://github.com/kubesphere/kubesphere/blob/master/LICENSE
|
||||
*/
|
||||
|
||||
package k8sutil
|
||||
|
||||
import (
|
||||
"github.com/Masterminds/semver/v3"
|
||||
)
|
||||
|
||||
func ServeBatchV1beta1(k8sVersion *semver.Version) bool {
|
||||
c, _ := semver.NewConstraint("< 1.21")
|
||||
return c.Check(k8sVersion)
|
||||
}
|
||||
|
||||
func ServeAutoscalingV2beta2(k8sVersion *semver.Version) bool {
|
||||
c, _ := semver.NewConstraint("< 1.23")
|
||||
return c.Check(k8sVersion)
|
||||
}
|
||||
Reference in New Issue
Block a user