Skip to content

Commit

Permalink
bump K8s to v1.21.14 (#88)
Browse files Browse the repository at this point in the history
  • Loading branch information
csuzhangxc authored Jul 13, 2023
1 parent 09dc739 commit 10c25e6
Show file tree
Hide file tree
Showing 26 changed files with 1,404 additions and 367 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
- test
# - test-integration
- e2e-examples
- e2e-v1.15
- e2e-v1.16
- e2e-v1.17
- e2e-v1.18
- e2e-v1.20
- e2e-v1.21
steps:
- name: Set up Go 1.19
uses: actions/setup-go@v2
Expand Down
41 changes: 41 additions & 0 deletions client/apis/apps/v1/helper/hijack.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ import (
"sync"

asv1 "github.com/pingcap/advanced-statefulset/client/apis/apps/v1"
asapplyv1 "github.com/pingcap/advanced-statefulset/client/client/applyconfiguration/apps/v1"
asclientset "github.com/pingcap/advanced-statefulset/client/client/clientset/versioned"
asclientsetv1 "github.com/pingcap/advanced-statefulset/client/client/clientset/versioned/typed/apps/v1"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/watch"
appsapplyv1 "k8s.io/client-go/applyconfigurations/apps/v1"
clientset "k8s.io/client-go/kubernetes"
clientsetappsv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
)
Expand Down Expand Up @@ -126,6 +128,30 @@ func (s *hijackStatefulSet) Watch(ctx context.Context, opts metav1.ListOptions)
return newHijackWatch(watch), nil
}

func (s *hijackStatefulSet) Apply(ctx context.Context, stsapply *appsapplyv1.StatefulSetApplyConfiguration, opts metav1.ApplyOptions) (result *appsv1.StatefulSet, err error) {
pcstsapply, err := FromBuiltinStatefulSetApplyConfiguration(stsapply)
if err != nil {
return nil, err
}
pcsts, err := s.StatefulSetInterface.Apply(ctx, pcstsapply, opts)
if err != nil {
return nil, err
}
return ToBuiltinStatefulSet(pcsts)
}

func (s *hijackStatefulSet) ApplyStatus(ctx context.Context, stsapply *appsapplyv1.StatefulSetApplyConfiguration, opts metav1.ApplyOptions) (result *appsv1.StatefulSet, err error) {
pcstsapply, err := FromBuiltinStatefulSetApplyConfiguration(stsapply)
if err != nil {
return nil, err
}
pcsts, err := s.StatefulSetInterface.ApplyStatus(ctx, pcstsapply, opts)
if err != nil {
return nil, err
}
return ToBuiltinStatefulSet(pcsts)
}

type hijackWatch struct {
sync.Mutex
source watch.Interface
Expand Down Expand Up @@ -236,3 +262,18 @@ func ToBuiltinStetefulsetList(stsList *asv1.StatefulSetList) (*appsv1.StatefulSe
}
return newList, nil
}

func FromBuiltinStatefulSetApplyConfiguration(sts *appsapplyv1.StatefulSetApplyConfiguration) (*asapplyv1.StatefulSetApplyConfiguration, error) {
data, err := json.Marshal(sts)
if err != nil {
return nil, err
}
newSet := &asapplyv1.StatefulSetApplyConfiguration{}
err = json.Unmarshal(data, newSet)
if err != nil {
return nil, err
}
apiVersion := asv1.SchemeGroupVersion.String()
newSet.APIVersion = &apiVersion
return newSet, nil
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

228 changes: 228 additions & 0 deletions client/client/applyconfiguration/apps/v1/statefulset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 10c25e6

Please sign in to comment.