Skip to content

Commit d02f620

Browse files
author
renxiangyu
committed
fix: kosmosctl using issues
Signed-off-by: renxiangyu <[email protected]>
1 parent 41dd4d7 commit d02f620

14 files changed

+45
-60
lines changed

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ upload-images: images
103103
docker push ${REGISTRY}/clusterlink-proxy:${VERSION}
104104
docker push ${REGISTRY}/clusterlink-network-manager:${VERSION}
105105
docker push ${REGISTRY}/clusterlink-floater:${VERSION}
106+
docker push ${REGISTRY}/clusterlink-elector:${VERSION}
106107

107108
.PHONY: release
108109
release:

‎deploy/clusterlink-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
effect: NoSchedule
2424
containers:
2525
- name: clusterlink-agent
26-
image: ghcr.io/kosmos-io/clusterlink/clusterlink-agent:__VERSION__
26+
image: ghcr.io/kosmos-io/clusterlink-agent:__VERSION__
2727
imagePullPolicy: IfNotPresent
2828
command:
2929
- clusterlink-agent

‎deploy/clusterlink-controller-manager.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
serviceAccountName: clusterlink-controller-manager
2525
containers:
2626
- name: manager
27-
image: ghcr.io/kosmos-io/clusterlink/clusterlink-controller-manager:__VERSION__
27+
image: ghcr.io/kosmos-io/clusterlink-controller-manager:__VERSION__
2828
imagePullPolicy: IfNotPresent
2929
command:
3030
- clusterlink-controller-manager

‎deploy/clusterlink-elector.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
fieldRef:
3535
apiVersion: v1
3636
fieldPath: spec.nodeName
37-
image: ghcr.io/kosmos-io/clusterlink/clusterlink-elector:__VERSION__
37+
image: ghcr.io/kosmos-io/clusterlink-elector:__VERSION__
3838
imagePullPolicy: IfNotPresent
3939
name: elector
4040
resources:

‎deploy/clusterlink-network-manager.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ spec:
6060
topologyKey: kubernetes.io/hostname
6161
containers:
6262
- name: manager
63-
image: ghcr.io/kosmos-io/clusterlink/clusterlink-network-manager:__VERSION__
63+
image: ghcr.io/kosmos-io/clusterlink-network-manager:__VERSION__
6464
imagePullPolicy: IfNotPresent
6565
command:
6666
- clusterlink-network-manager

‎deploy/clusterlink-operator.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
topologyKey: kubernetes.io/hostname
3737
containers:
3838
- name: operator
39-
image: ghcr.io/kosmos-io/clusterlink/clusterlink-operator:__VERSION__
39+
image: ghcr.io/kosmos-io/clusterlink-operator:__VERSION__
4040
imagePullPolicy: IfNotPresent
4141
command:
4242
- clusterlink-operator

‎deploy/clusterlink-proxy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
name: clusterlink-agent-proxy
3838
containers:
3939
- name: manager
40-
image: ghcr.io/kosmos-io/clusterlink/clusterlink-proxy:__VERSION__
40+
image: ghcr.io/kosmos-io/clusterlink-proxy:__VERSION__
4141
imagePullPolicy: IfNotPresent
4242
command:
4343
- clusterlink-proxy

‎hack/util.sh

+12-12
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ CLUSTERLINK_TARGET_SOURCE=(
2323
clusterlink-network-manager=cmd/network-manager
2424
)
2525

26-
#https://textkool.com/en/ascii-art-generator?hl=default&vl=default&font=DOS%20Rebel&text=ClusterLink
27-
CLUSTERLINK_GREETING='
28-
------------------------------------------------------------------------------------------------------
29-
█████████ ████ █████ █████ ███ █████
30-
███░░░░░███░░███ ░░███ ░░███ ░░░ ░░███
31-
███ ░░░ ░███ █████ ████ █████ ███████ ██████ ████████ ░███ ████ ████████ ░███ █████
32-
░███ ░███ ░░███ ░███ ███░░ ░░░███░ ███░░███░░███░░███ ░███ ░░███ ░░███░░███ ░███░░███
33-
░███ ░███ ░███ ░███ ░░█████ ░███ ░███████ ░███ ░░░ ░███ ░███ ░███ ░███ ░██████░
34-
░░███ ███ ░███ ░███ ░███ ░░░░███ ░███ ███░███░░░ ░███ ░███ █ ░███ ░███ ░███ ░███░░███
35-
░░█████████ █████ ░░████████ ██████ ░░█████ ░░██████ █████ ███████████ █████ ████ █████ ████ █████
36-
░░░░░░░░░ ░░░░░ ░░░░░░░░ ░░░░░░ ░░░░░ ░░░░░░ ░░░░░ ░░░░░░░░░░░ ░░░░░ ░░░░ ░░░░░ ░░░░ ░░░░░
37-
------------------------------------------------------------------------------------------------------
26+
#https://textkool.com/en/ascii-art-generator?hl=default&vl=default&font=DOS%20Rebel&text=KOSMOS
27+
KOSMOS_GREETING='
28+
--------------------------------------------------------------------------------------
29+
█████ ████ ███████ █████████ ██████ ██████ ███████ █████████
30+
░░███ ███░ ███░░░░░███ ███░░░░░███░░██████ ██████ ███░░░░░███ ███░░░░░███
31+
░███ ███ ███ ░░███░███ ░░░ ░███░█████░███ ███ ░░███░███ ░░░
32+
░███████ ░███ ░███░░█████████ ░███░░███ ░███ ░███ ░███░░█████████
33+
░███░░███ ░███ ░███ ░░░░░░░░███ ░███ ░░░ ░███ ░███ ░███ ░░░░░░░░███
34+
░███ ░░███ ░░███ ███ ███ ░███ ░███ ░███ ░░███ ███ ███ ░███
35+
█████ ░░████ ░░░███████░ ░░█████████ █████ █████ ░░░███████░ ░░█████████
36+
░░░░░ ░░░░ ░░░░░░░ ░░░░░░░░░ ░░░░░ ░░░░░ ░░░░░░░ ░░░░░░░░░
37+
---------------------------------------------------------------------------------------
3838
'
3939

4040
function util::get_target_source() {

‎pkg/kosmosctl/join/join.go

+14-20
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package join
22

33
import (
44
"context"
5-
"encoding/base64"
65
"fmt"
76
"os"
87

@@ -28,11 +27,8 @@ import (
2827
)
2928

3029
var joinExample = templates.Examples(i18n.T(`
31-
# join member1-cluster to master control plane
32-
kosmosctl join --cluster-kubeconfig=[member-kubeconfig] -f member1-cluster.yaml --master-kubeconfig=[master-kubeconfig]
33-
34-
# join member1-cluster to current master control plane
35-
kosmosctl join --cluster-kubeconfig=[member-kubeconfig] -f member1-cluster.yaml
30+
# join member-cluster to master control plane
31+
kosmosctl join -f member-cluster.yaml --master-kubeconfig=[master-kubeconfig] --cluster-kubeconfig=[member-kubeconfig]
3632
`))
3733

3834
type CommandJoinOptions struct {
@@ -69,6 +65,10 @@ func NewCmdJoin(f ctlutil.Factory) *cobra.Command {
6965
fmt.Printf("kosmosctl join cmd error, MarkFlagRequired failed: %s", err)
7066
}
7167
cmd.Flags().StringVarP(&o.MasterKubeConfig, "master-kubeconfig", "", "", "master-kubeconfig")
68+
err = cmd.MarkFlagRequired("master-kubeconfig")
69+
if err != nil {
70+
fmt.Printf("kosmosctl join cmd error, MarkFlagRequired failed: %s", err)
71+
}
7272
cmd.Flags().StringVarP(&o.ClusterKubeConfig, "cluster-kubeconfig", "", "", "cluster-kubeconfig")
7373
err = cmd.MarkFlagRequired("cluster-kubeconfig")
7474
if err != nil {
@@ -82,16 +82,9 @@ func (o *CommandJoinOptions) Complete(f ctlutil.Factory, cmd *cobra.Command, arg
8282
var masterConfig *restclient.Config
8383
var err error
8484

85-
if o.MasterKubeConfig != "" {
86-
masterConfig, err = clientcmd.BuildConfigFromFlags("", o.MasterKubeConfig)
87-
if err != nil {
88-
return fmt.Errorf("kosmosctl join complete error, generate masterConfig failed: %s", err)
89-
}
90-
} else {
91-
masterConfig, err = f.ToRESTConfig()
92-
if err != nil {
93-
return fmt.Errorf("kosmosctl join complete error, get current masterConfig failed: %s", err)
94-
}
85+
masterConfig, err = clientcmd.BuildConfigFromFlags("", o.MasterKubeConfig)
86+
if err != nil {
87+
return fmt.Errorf("kosmosctl join complete error, generate masterConfig failed: %s", err)
9588
}
9689

9790
clusterConfig, err := clientcmd.BuildConfigFromFlags("", o.ClusterKubeConfig)
@@ -146,9 +139,9 @@ func (o *CommandJoinOptions) Run(f ctlutil.Factory, cmd *cobra.Command, args []s
146139
}
147140

148141
// 3. create secret in member
149-
memberFile, err := os.ReadFile(o.ClusterKubeConfig)
150-
if err != nil {
151-
return fmt.Errorf("(secret) kosmosctl join run warning, read memberconfig failed: %s", err)
142+
masterKubeConfig, err := os.ReadFile(o.MasterKubeConfig)
143+
if err != nil && !apierrors.IsAlreadyExists(err) {
144+
return fmt.Errorf("(secret) kosmosctl join run warning, read masterconfig failed: %s", err)
152145
}
153146
secret := &corev1.Secret{
154147
TypeMeta: metav1.TypeMeta{},
@@ -157,7 +150,8 @@ func (o *CommandJoinOptions) Run(f ctlutil.Factory, cmd *cobra.Command, args []s
157150
Namespace: utils.NamespaceClusterLinksystem,
158151
},
159152
Data: map[string][]byte{
160-
"kubeconfig": []byte(base64.StdEncoding.EncodeToString(memberFile))},
153+
"kubeconfig": masterKubeConfig,
154+
},
161155
}
162156
_, err = o.Client.CoreV1().Secrets(secret.Namespace).Create(context.TODO(), secret, metav1.CreateOptions{})
163157
if err != nil && !apierrors.IsAlreadyExists(err) {

‎pkg/kosmosctl/manifest/manifest_daemonsets.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
operator: DoesNotExist
3131
containers:
3232
- name: floater
33-
image: {{ .ImageRepository }}/clusterlink-floater:{{ .Version }}
33+
image: {{ .ImageRepository }}/clusterlink-floater:v{{ .Version }}
3434
imagePullPolicy: IfNotPresent
3535
command:
3636
- clusterlink-floater

‎pkg/kosmosctl/manifest/manifest_deployments.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
serviceAccountName: clusterlink-network-manager
2323
containers:
2424
- name: manager
25-
image: {{ .ImageRepository }}/clusterlink-network-manager:{{ .Version }}
25+
image: {{ .ImageRepository }}/clusterlink-network-manager:v{{ .Version }}
2626
imagePullPolicy: IfNotPresent
2727
command:
2828
- clusterlink-network-manager
@@ -68,7 +68,7 @@ spec:
6868
topologyKey: kubernetes.io/hostname
6969
containers:
7070
- name: operator
71-
image: ghcr.io/kosmos-io/clusterlink-operator:__VERSION__
71+
image: ghcr.io/kosmos-io/clusterlink-operator:v{{ .Version }}
7272
imagePullPolicy: IfNotPresent
7373
command:
7474
- clusterlink-operator
@@ -82,7 +82,7 @@ spec:
8282
memory: 200Mi
8383
env:
8484
- name: VERSION
85-
value: {{ .Version }}
85+
value: v{{ .Version }}
8686
- name: CLUSTER_NAME
8787
value: {{ .ClusterName }}
8888
- name: USE_PROXY

‎pkg/kosmosctl/unjoin/unjoin.go

+6-16
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ const (
2727

2828
var unjoinExample = templates.Examples(i18n.T(`
2929
# unjoin member1-cluster in master control plane
30-
kosmosctl unjoin member1-cluster --cluster-kubeconfig=[member-kubeconfig] --master-kubeconfig=[master-kubeconfig]
30+
kosmosctl unjoin member-cluster --cluster-kubeconfig=[member-kubeconfig] --master-kubeconfig=[master-kubeconfig]
3131
3232
# unjoin member1-cluster in current master control plane
33-
kosmosctl unjoin member1-cluster --cluster-kubeconfig=[member-kubeconfig]
33+
kosmosctl unjoin member-cluster --cluster-kubeconfig=[member-kubeconfig]
3434
`))
3535

3636
type CommandUnJoinOptions struct {
@@ -108,33 +108,23 @@ func (o *CommandUnJoinOptions) Validate() error {
108108

109109
func (o *CommandUnJoinOptions) Run(f ctlutil.Factory, cmd *cobra.Command, args []string) error {
110110
//delete cluster
111-
err := o.DynamicClient.Resource(schema.GroupVersionResource{
112-
Group: "kosmos.io",
113-
Version: "v1alpha1",
114-
Resource: "clusters",
115-
}).Namespace("").Delete(context.TODO(), args[0], metav1.DeleteOptions{})
116-
if err != nil && !apierrors.IsNotFound(err) {
117-
return fmt.Errorf("(cluster) kosmosctl unjoin run error, delete cluster failed: %s", err)
118-
}
119-
120111
for {
121-
// Wait 3 second
122-
time.Sleep(3 * time.Second)
123-
_, err := o.DynamicClient.Resource(schema.GroupVersionResource{
112+
err := o.DynamicClient.Resource(schema.GroupVersionResource{
124113
Group: "kosmos.io",
125114
Version: "v1alpha1",
126115
Resource: "clusters",
127-
}).Namespace("").Get(context.TODO(), args[0], metav1.GetOptions{})
116+
}).Namespace("").Delete(context.TODO(), args[0], metav1.DeleteOptions{})
128117
if err != nil {
129118
if apierrors.IsNotFound(err) {
130119
break
131120
}
132121
return fmt.Errorf("(cluster) kosmosctl unjoin run error, delete cluster failed: %s", err)
133122
}
123+
time.Sleep(3 * time.Second)
134124
}
135125

136126
// delete operator
137-
err = o.Client.CoreV1().ServiceAccounts(util.DefaultNamespace).Delete(context.TODO(), ClusterlinkOperator, metav1.DeleteOptions{})
127+
err := o.Client.CoreV1().ServiceAccounts(util.DefaultNamespace).Delete(context.TODO(), ClusterlinkOperator, metav1.DeleteOptions{})
138128
if err != nil && !apierrors.IsNotFound(err) {
139129
return fmt.Errorf("(operator) kosmosctl unjoin run error, delete serviceaccout failed: %s", err)
140130
}

‎pkg/operator/addons/proxy/manifests.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
- key: app
4848
operator: In
4949
values:
50-
- elector
50+
- clusterlink-proxy
5151
namespaces:
5252
- clusterlink-system
5353
topologyKey: kubernetes.io/hostname

‎pkg/operator/operator_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
const (
2828
controllerName = "operator-controller"
29-
ClusterControllerFinalizer = "cnp.io/operator-controller"
29+
ClusterControllerFinalizer = "kosmos.io/operator-controller"
3030
)
3131

3232
// nolint

0 commit comments

Comments
 (0)