Skip to content

Commit 53b91c7

Browse files
zbb88888zbb88888
committed
project rename
1 parent af07480 commit 53b91c7

29 files changed

+81
-81
lines changed

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
3030
# This variable is used to construct full image tags for bundle and catalog images.
3131
#
3232
# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
33-
# kube-ovn-operator.com/vpn-gw-bundle:$VERSION and kube-ovn-operator.com/vpn-gw-catalog:$VERSION.
33+
# kube-combo.com/vpn-gw-bundle:$VERSION and kube-combo.com/vpn-gw-catalog:$VERSION.
3434
#
35-
# IMAGE_TAG_BASE ?= kube-ovn-operator.com/vpn-gw
36-
IMAGE_TAG_BASE ?= registry.cn-hangzhou.aliyuncs.com/bobz/kube-ovn-operator
35+
# IMAGE_TAG_BASE ?= kube-combo.com/vpn-gw
36+
IMAGE_TAG_BASE ?= registry.cn-hangzhou.aliyuncs.com/bobz/kube-combo
3737
SSL_VPN_IMG_BASE ?= registry.cn-hangzhou.aliyuncs.com/bobz/openvpn
3838
IPSEC_VPN_IMG_BASE ?= registry.cn-hangzhou.aliyuncs.com/bobz/strongswan
3939

‎PROJECT

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22
# This file is used to track the info used to scaffold your project
33
# and allow the plugins properly work.
44
# More info: https://book.kubebuilder.io/reference/project-config.html
5-
domain: kube-ovn-operator.com
5+
domain: kube-combo.com
66
layout:
77
- go.kubebuilder.io/v4-alpha
88
plugins:
99
manifests.sdk.operatorframework.io/v2: {}
1010
scorecard.sdk.operatorframework.io/v2: {}
1111
projectName: vpn-gw
12-
repo: github.com/bobz965/kube-ovn-operator
12+
repo: github.com/bobz965/kube-combo
1313
resources:
1414
- api:
1515
crdVersion: v1
1616
namespaced: true
1717
controller: true
18-
domain: kube-ovn-operator.com
18+
domain: kube-combo.com
1919
group: vpn-gw
2020
kind: VpnGw
21-
path: github.com/bobz965/kube-ovn-operator/api/v1
21+
path: github.com/bobz965/kube-combo/api/v1
2222
version: v1
2323
- api:
2424
crdVersion: v1
2525
namespaced: true
2626
controller: true
27-
domain: kube-ovn-operator.com
27+
domain: kube-combo.com
2828
group: vpn-gw
2929
kind: IpsecConn
30-
path: github.com/bobz965/kube-ovn-operator/api/v1
30+
path: github.com/bobz965/kube-combo/api/v1
3131
version: v1
3232
version: "3"

‎README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# kube-ovn-operator
1+
# kube-combo
22

33
该项目用于在 kube-ovn-cni 的一个**补充**，用于实现一些 kube-ovn-cni 中属于间接关联的一些网络应用。直接关联的网络功能应直接在 kube-ovn 中实现。
44
为了保持该项目的定位的清晰和轻量：
@@ -11,10 +11,10 @@
1111

1212
``` bash
1313

14-
operator-sdk init --domain kube-ovn-operator.com --repo github.com/bobz965/kube-ovn-operator --plugins=go/v4-alpha
14+
operator-sdk init --domain kube-combo.com --repo github.com/bobz965/kube-combo --plugins=go/v4-alpha
1515

16-
# we'll use a domain of kube-ovn-operator.com
17-
# so all API groups will be <group>.kube-ovn-operator.com
16+
# we'll use a domain of kube-combo.com
17+
# so all API groups will be <group>.kube-combo.com
1818

1919
# --plugins=go/v4-alpha mac arm 芯片需要指定
2020

@@ -110,8 +110,8 @@ make bundle bundle-build bundle-push
110110

111111
``` bash
112112

113-
cd config/manager && /root/kube-ovn-operator/bin/kustomize edit set image controller=registry.cn-hangzhou.aliyuncs.com/bobz/kube-ovn-operator:latest
114-
/root/kube-ovn-operator/bin/kustomize build config/default | kubectl apply -f -
113+
cd config/manager && /root/kube-combo/bin/kustomize edit set image controller=registry.cn-hangzhou.aliyuncs.com/bobz/kube-combo:latest
114+
/root/kube-combo/bin/kustomize build config/default | kubectl apply -f -
115115

116116

117117
```
@@ -131,7 +131,7 @@ chmod +x install.sh
131131

132132
# 运行 operator
133133

134-
operator-sdk run bundle registry.cn-hangzhou.aliyuncs.com/bobz/kube-ovn-operator-bundle:v0.0.1
134+
operator-sdk run bundle registry.cn-hangzhou.aliyuncs.com/bobz/kube-combo-bundle:v0.0.1
135135

136136
# 检查 operator 已安装
137137

‎api/v1/groupversion_info.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
// Package v1 contains API Schema definitions for the vpn-gw v1 API group
1818
// +kubebuilder:object:generate=true
19-
// +groupName=vpn-gw.kube-ovn-operator.com
19+
// +groupName=vpn-gw.kube-combo.com
2020
package v1
2121

2222
import (
@@ -26,7 +26,7 @@ import (
2626

2727
var (
2828
// GroupVersion is group version used to register these objects
29-
GroupVersion = schema.GroupVersion{Group: "vpn-gw.kube-ovn-operator.com", Version: "v1"}
29+
GroupVersion = schema.GroupVersion{Group: "vpn-gw.kube-combo.com", Version: "v1"}
3030

3131
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
3232
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

‎bundle/manifests/vpn-gw.clusterserviceversion.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
alm-examples: |-
66
[
77
{
8-
"apiVersion": "vpn-gw.kube-ovn-operator.com/v1",
8+
"apiVersion": "vpn-gw.kube-combo.com/v1",
99
"kind": "VpnGw",
1010
"metadata": {
1111
"labels": {
@@ -33,14 +33,14 @@ spec:
3333
- description: VpnGw is the Schema for the vpngws API
3434
displayName: Vpn Gw
3535
kind: VpnGw
36-
name: vpngws.vpn-gw.kube-ovn-operator.com
36+
name: vpngws.vpn-gw.kube-combo.com
3737
statusDescriptors:
3838
- description: Conditions store the status conditions of the vpn gw instances
3939
displayName: Conditions
4040
path: conditions
4141
version: v1
42-
description: kube-ovn-operator
43-
displayName: kube-ovn-operator
42+
description: kube-combo
43+
displayName: kube-combo
4444
icon:
4545
- base64data: ""
4646
mediatype: ""
@@ -61,7 +61,7 @@ spec:
6161
- update
6262
- watch
6363
- apiGroups:
64-
- vpn-gw.kube-ovn-operator.com
64+
- vpn-gw.kube-combo.com
6565
resources:
6666
- vpngws
6767
verbs:
@@ -73,13 +73,13 @@ spec:
7373
- update
7474
- watch
7575
- apiGroups:
76-
- vpn-gw.kube-ovn-operator.com
76+
- vpn-gw.kube-combo.com
7777
resources:
7878
- vpngws/finalizers
7979
verbs:
8080
- update
8181
- apiGroups:
82-
- vpn-gw.kube-ovn-operator.com
82+
- vpn-gw.kube-combo.com
8383
resources:
8484
- vpngws/status
8585
verbs:
@@ -168,7 +168,7 @@ spec:
168168
- --leader-elect
169169
command:
170170
- /manager
171-
image: registry.cn-hangzhou.aliyuncs.com/bobz/kube-ovn-operator:latest
171+
image: registry.cn-hangzhou.aliyuncs.com/bobz/kube-combo:latest
172172
livenessProbe:
173173
httpGet:
174174
path: /healthz
@@ -243,11 +243,11 @@ spec:
243243
- supported: true
244244
type: AllNamespaces
245245
keywords:
246-
- kube-ovn-operator
246+
- kube-combo
247247
links:
248248
- name: Vpn Gw
249249
url: https://vpn-gw.domain
250250
maturity: alpha
251251
provider:
252-
name: kube-ovn-operator
252+
name: kube-combo
253253
version: 0.0.1

‎bundle/manifests/vpn-gw.kube-ovn-operator.com_vpngws.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.11.1
66
creationTimestamp: null
7-
name: vpngws.vpn-gw.kube-ovn-operator.com
7+
name: vpngws.vpn-gw.kube-combo.com
88
spec:
9-
group: vpn-gw.kube-ovn-operator.com
9+
group: vpn-gw.kube-combo.com
1010
names:
1111
kind: VpnGw
1212
listKind: VpnGwList

‎cmd/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
"sigs.k8s.io/controller-runtime/pkg/healthz"
3333
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3434

35-
vpngwv1 "github.com/bobz965/kube-ovn-operator/api/v1"
36-
"github.com/bobz965/kube-ovn-operator/internal/controller"
35+
vpngwv1 "github.com/bobz965/kube-combo/api/v1"
36+
"github.com/bobz965/kube-combo/internal/controller"
3737
//+kubebuilder:scaffold:imports
3838
)
3939

@@ -77,7 +77,7 @@ func main() {
7777
Port: 9443,
7878
HealthProbeBindAddress: probeAddr,
7979
LeaderElection: enableLeaderElection,
80-
LeaderElectionID: "a7db789a.kube-ovn-operator.com",
80+
LeaderElectionID: "a7db789a.kube-combo.com",
8181
// LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily
8282
// when the Manager ends. This requires the binary to immediately end when the
8383
// Manager is stopped, otherwise, this setting is unsafe. Setting this significantly

‎config/crd/bases/vpn-gw.kube-ovn-operator.com_ipsecconnections.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.11.1
77
creationTimestamp: null
8-
name: ipsecconnections.vpn-gw.kube-ovn-operator.com
8+
name: ipsecconnections.vpn-gw.kube-combo.com
99
spec:
10-
group: vpn-gw.kube-ovn-operator.com
10+
group: vpn-gw.kube-combo.com
1111
names:
1212
kind: IpsecConnection
1313
listKind: IpsecConnectionList

‎config/crd/bases/vpn-gw.kube-ovn-operator.com_ipsecconns.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.11.1
77
creationTimestamp: null
8-
name: ipsecconns.vpn-gw.kube-ovn-operator.com
8+
name: ipsecconns.vpn-gw.kube-combo.com
99
spec:
10-
group: vpn-gw.kube-ovn-operator.com
10+
group: vpn-gw.kube-combo.com
1111
names:
1212
kind: IpsecConn
1313
listKind: IpsecConnList

‎config/crd/bases/vpn-gw.kube-ovn-operator.com_vpngws.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.11.1
77
creationTimestamp: null
8-
name: vpngws.vpn-gw.kube-ovn-operator.com
8+
name: vpngws.vpn-gw.kube-combo.com
99
spec:
10-
group: vpn-gw.kube-ovn-operator.com
10+
group: vpn-gw.kube-combo.com
1111
names:
1212
kind: VpnGw
1313
listKind: VpnGwList

‎config/crd/kustomization.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# since it depends on service name and namespace that are out of this kustomize package.
33
# It should be run by config/default
44
resources:
5-
- bases/vpn-gw.kube-ovn-operator.com_vpngws.yaml
6-
- bases/vpn-gw.kube-ovn-operator.com_ipsecconns.yaml
5+
- bases/vpn-gw.kube-combo.com_vpngws.yaml
6+
- bases/vpn-gw.kube-combo.com_ipsecconns.yaml
77
#+kubebuilder:scaffold:crdkustomizeresource
88

99
patchesStrategicMerge:

‎config/crd/patches/cainjection_in_ipsecconns.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME
7-
name: ipsecconns.vpn-gw.kube-ovn-operator.com
7+
name: ipsecconns.vpn-gw.kube-combo.com

‎config/crd/patches/cainjection_in_vpngws.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME
7-
name: vpngws.vpn-gw.kube-ovn-operator.com
7+
name: vpngws.vpn-gw.kube-combo.com

‎config/crd/patches/webhook_in_ipsecconns.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
5-
name: ipsecconns.vpn-gw.kube-ovn-operator.com
5+
name: ipsecconns.vpn-gw.kube-combo.com
66
spec:
77
conversion:
88
strategy: Webhook

‎config/crd/patches/webhook_in_vpngws.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
5-
name: vpngws.vpn-gw.kube-ovn-operator.com
5+
name: vpngws.vpn-gw.kube-combo.com
66
spec:
77
conversion:
88
strategy: Webhook

‎config/manager/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
44
kind: Kustomization
55
images:
66
- name: controller
7-
newName: registry.cn-hangzhou.aliyuncs.com/bobz/kube-ovn-operator
7+
newName: registry.cn-hangzhou.aliyuncs.com/bobz/kube-combo
88
newTag: latest

‎config/manifests/bases/vpn-gw.clusterserviceversion.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ spec:
1313
- description: VpnGw is the Schema for the vpngws API
1414
displayName: Vpn Gw
1515
kind: VpnGw
16-
name: vpngws.vpn-gw.kube-ovn-operator.com
16+
name: vpngws.vpn-gw.kube-combo.com
1717
statusDescriptors:
1818
- description: Conditions store the status conditions of the vpn gw instances
1919
displayName: Conditions
2020
path: conditions
2121
version: v1
22-
description: kube-ovn-operator
23-
displayName: kube-ovn-operator
22+
description: kube-combo
23+
displayName: kube-combo
2424
icon:
2525
- base64data: ""
2626
mediatype: ""
@@ -38,11 +38,11 @@ spec:
3838
- supported: true
3939
type: AllNamespaces
4040
keywords:
41-
- kube-ovn-operator
41+
- kube-combo
4242
links:
4343
- name: Vpn Gw
4444
url: https://vpn-gw.domain
4545
maturity: alpha
4646
provider:
47-
name: kube-ovn-operator
47+
name: kube-combo
4848
version: 0.0.0

‎config/rbac/ipsecconn_editor_role.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ metadata:
1212
name: ipsecconn-editor-role
1313
rules:
1414
- apiGroups:
15-
- vpn-gw.kube-ovn-operator.com
15+
- vpn-gw.kube-combo.com
1616
resources:
1717
- ipsecconns
1818
verbs:
@@ -24,7 +24,7 @@ rules:
2424
- update
2525
- watch
2626
- apiGroups:
27-
- vpn-gw.kube-ovn-operator.com
27+
- vpn-gw.kube-combo.com
2828
resources:
2929
- ipsecconns/status
3030
verbs:

‎config/rbac/ipsecconn_viewer_role.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ metadata:
1212
name: ipsecconn-viewer-role
1313
rules:
1414
- apiGroups:
15-
- vpn-gw.kube-ovn-operator.com
15+
- vpn-gw.kube-combo.com
1616
resources:
1717
- ipsecconns
1818
verbs:
1919
- get
2020
- list
2121
- watch
2222
- apiGroups:
23-
- vpn-gw.kube-ovn-operator.com
23+
- vpn-gw.kube-combo.com
2424
resources:
2525
- ipsecconns/status
2626
verbs:

0 commit comments

Comments
 (0)