Skip to content

Commit

Permalink
Merge pull request #3 from fleetboard-io/dev/fleetboard
Browse files Browse the repository at this point in the history
refactor: rename to fleetboard
  • Loading branch information
Airren authored Aug 16, 2024
2 parents 9bd917f + c2729a9 commit f7279b7
Show file tree
Hide file tree
Showing 13 changed files with 66 additions and 66 deletions.
4 changes: 2 additions & 2 deletions charts/cluster/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
name: nauti-agent
name: fleetboard-agent
description: A Helm chart for Tunnel across clusters.

# A chart can be either an 'application' or a 'library' chart.
Expand All @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.1
version: 0.2.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
22 changes: 11 additions & 11 deletions charts/cluster/templates/cnf-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ metadata:
kind: DaemonSet
apiVersion: apps/v1
metadata:
name: cnf-nauti
namespace: nauti-system
name: cnf-fleetboard
namespace: fleetboard-system
spec:
selector:
matchLabels:
app: cnf-nauti
app: cnf-fleetboard
template:
metadata:
labels:
app: cnf-nauti
router.nauti.io/cnf: "true"
app: cnf-fleetboard
router.fleetboard.io/cnf: "true"
spec:
serviceAccountName: {{ .Values.serviceAccount.name }}
hostNetwork: false
Expand All @@ -31,7 +31,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: PARALLEL_IP_ANNOTATION
value: "router.nauti.io/dedicated_ip"
value: "router.fleetboard.io/dedicated_ip"
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}/controller:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
resources:
Expand All @@ -51,19 +51,19 @@ spec:
- --local-namespace=syncer-operator
- --as-hub={{ .Values.cluster.hub }}
- --as-cluster=true
- --hub-secret-namespace=nauti-system
- --hub-secret-namespace=fleetboard-system
- --hub-secret-name={{ .Values.hub.secretName }}
- --hub-url={{ .Values.hub.hubURL }}
env:
- name: NAUTI_CLUSTERID
- name: FLEETBOARD_CLUSTERID
value: {{ .Values.cluster.clusterID }}
- name: NAUTI_BOOTSTRAPTOKEN
- name: FLEETBOARD_BOOTSTRAPTOKEN
value: re51os.131tn13kek2iaqoz
- name: NAUTI_PODNAME
- name: FLEETBOARD_PODNAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: NAUTI_PODNAMESPACE
- name: FLEETBOARD_PODNAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
Expand Down
6 changes: 3 additions & 3 deletions charts/cluster/templates/crossdns-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app: crossdns
component: crossdns
name: crossdns
namespace: nauti-system
namespace: fleetboard-system
data:
Corefile: |
{{ .Values.cluster.zone }}:53 {
Expand All @@ -22,7 +22,7 @@ metadata:
app: crossdns
component: crossdns
name: crossdns
namespace: nauti-system
namespace: fleetboard-system
spec:
clusterIP:
{{- range (lookup "v1" "Service" "kube-system" "").items }}
Expand All @@ -45,7 +45,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: crossdns
namespace: nauti-system
namespace: fleetboard-system
labels:
app: crossdns
spec:
Expand Down
6 changes: 3 additions & 3 deletions charts/cluster/templates/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.serviceAccount.name }}
namespace: nauti-system
namespace: fleetboard-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: nauti:controller-manager
name: fleetboard:controller-manager
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: cluster-admin
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount.name }}
namespace: nauti-system
namespace: fleetboard-system
2 changes: 1 addition & 1 deletion charts/cluster/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
namespace: nauti-system
namespace: fleetboard-system
labels:
app: {{ .Chart.Name }}
spec:
Expand Down
8 changes: 4 additions & 4 deletions charts/cluster/values.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Default values for octopus.
# Default values for fleetboard.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
image:
registry: ghcr.io
repository: nauti-io
repository: fleetboard-io
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
Expand All @@ -20,12 +20,12 @@ cluster:
hub:
hubURL: https://121.41.31.123:6443
bootstraptoken: re51os.131tn13kek2iaqoz
secretName: nauti
secretName: fleetboard

serviceAccount:
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: nauti
name: fleetboard

service:
type: NodePort
Expand Down
4 changes: 2 additions & 2 deletions charts/hub/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
name: nauti
name: fleetboard
description: A Helm chart for Tunnel across clusters.

# A chart can be either an 'application' or a 'library' chart.
Expand All @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.1
version: 0.2.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: peers.octopus.io
name: peers.fleetboard.io
spec:
group: octopus.io
group: fleetboard.io
names:
categories:
- octopus
- fleetboard
kind: Peer
listKind: PeerList
plural: peers
Expand Down
4 changes: 2 additions & 2 deletions charts/hub/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Thank you for installing {{ .Chart.Name }}.

Your release is named {{ .Release.Name }}.

Continue to install nauti-agent on clusters, and install nauti-agent in cluster by:
Continue to install fleetboard-agent on clusters, and install fleetboard-agent in cluster by:

helm install nauti-agent mcs/nauti-agent --namespace nauti-system --create-namespace \
helm install fleetboard-agent fleetboard/fleetboard-agent --namespace fleetboard-system --create-namespace \
--set hub.hubURL=https://{{ .Values.tunnel.endpoint }}:6443 --set cluster.clusterID=cluster1
20 changes: 10 additions & 10 deletions charts/hub/templates/cnf-hub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ metadata:
apiVersion: apps/v1
kind: Deployment
metadata:
name: cnf-nauti
namespace: nauti-system
name: cnf-fleetboard
namespace: fleetboard-system
labels:
app: cnf-nauti
app: cnf-fleetboard
spec:
replicas: 2
selector:
matchLabels:
app: cnf-nauti
app: cnf-fleetboard
template:
metadata:
labels:
app: cnf-nauti
router.nauti.io/cnf: "true"
app: cnf-fleetboard
router.fleetboard.io/cnf: "true"
spec:
serviceAccountName: {{ .Values.serviceAccount.name }}
hostNetwork: false
Expand All @@ -39,15 +39,15 @@ spec:
- --as-cluster=false
- --shared-namespace=syncer-operator
env:
- name: NAUTI_CLUSTERID
- name: FLEETBOARD_CLUSTERID
value: {{ .Values.cluster.clusterID }}
- name: NAUTI_ENDPOINT
- name: FLEETBOARD_ENDPOINT
value: {{ .Values.tunnel.endpoint }}
- name: NAUTI_PODNAME
- name: FLEETBOARD_PODNAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: NAUTI_PODNAMESPACE
- name: FLEETBOARD_PODNAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
Expand Down
38 changes: 19 additions & 19 deletions charts/hub/templates/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.serviceAccount.name }}
namespace: nauti-system
namespace: fleetboard-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: octopus-local-rolebinding
name: fleetboard-local-rolebinding
namespace: {{ .Values.cluster.sharenamespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -17,7 +17,7 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount.name }}
namespace: nauti-system
namespace: fleetboard-system

---
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -26,7 +26,7 @@ metadata:
namespace: {{ .Values.cluster.sharenamespace }}
name: mcs-syncer
rules:
- apiGroups: ["octopus.io"]
- apiGroups: ["fleetboard.io"]
resources: ["peers"]
verbs: ["*"]
- apiGroups: [ "discovery.k8s.io" ]
Expand All @@ -36,16 +36,16 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: octopus-manager-rolebinding
namespace: nauti-system
name: fleetboard-manager-rolebinding
namespace: fleetboard-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: hub-manager
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount.name }}
namespace: nauti-system
namespace: fleetboard-system

---
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -67,7 +67,7 @@ apiVersion: v1
kind: Secret
metadata:
name: {{ .Values.serviceAccount.name }}
namespace: nauti-system
namespace: fleetboard-system
annotations:
kubernetes.io/service-account.name: {{ .Values.serviceAccount.name | quote }}
type: kubernetes.io/service-account-token
Expand All @@ -83,7 +83,7 @@ metadata:
# Type MUST be 'bootstrap.kubernetes.io/token'
type: bootstrap.kubernetes.io/token
stringData:
description: "The bootstrap token used by nauti network first connection."
description: "The bootstrap token used by fleetboard network first connection."
# Token ID and secret. Required.
token-id: re51os
token-secret: 131tn13kek2iaqoz
Expand All @@ -93,13 +93,13 @@ stringData:
usage-bootstrap-authentication: "true"
usage-bootstrap-signing: "true"
# Extra groups to authenticate the token as. Must start with "system:bootstrappers:"
auth-extra-groups: system:bootstrappers:nauti:register-token
auth-extra-groups: system:bootstrappers:fleetboard:register-token
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: nauti:system:bootstrapping
namespace: nauti-system
name: fleetboard:system:bootstrapping
namespace: fleetboard-system
rules:
- apiGroups: [ "" ]
resources: [ "secrets" ]
Expand All @@ -108,24 +108,24 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: nauti:system:bootstrapping
namespace: nauti-system
name: fleetboard:system:bootstrapping
namespace: fleetboard-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: nauti:system:bootstrapping
name: fleetboard:system:bootstrapping
subjects:
- apiGroup: rbac.authorization.k8s.io
kind: Group
name: system:bootstrappers:nauti:register-token
name: system:bootstrappers:fleetboard:register-token

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
rbac.authorization.k8s.io/system-only: "true"
name: nauti:dedinic-cni
name: fleetboard:dedinic-cni
rules:
- apiGroups:
- ""
Expand Down Expand Up @@ -178,10 +178,10 @@ kind: ClusterRoleBinding
metadata:
name: dedinic-cni
roleRef:
name: nauti:dedinic-cni
name: fleetboard:dedinic-cni
kind: ClusterRole
apiGroup: rbac.authorization.k8s.io
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount.name }}
namespace: nauti-system
namespace: fleetboard-system
6 changes: 3 additions & 3 deletions charts/hub/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
namespace: nauti-system
namespace: fleetboard-system
labels:
app: {{ .Chart.Name }}
spec:
Expand All @@ -14,5 +14,5 @@ spec:
name: udp
nodePort: {{ .Values.service.nodePort }}
selector:
app: cnf-nauti
router.nauti.io/leader: "true"
app: cnf-fleetboard
router.fleetboard.io/leader: "true"
Loading

0 comments on commit f7279b7

Please sign in to comment.