Skip to content

Commit

Permalink
Merge pull request #10 from fleetboard-io/remove-creating-namespace-flag
Browse files Browse the repository at this point in the history
add fleetboard-system namespace and remove  --create-namespace flag
  • Loading branch information
lmxia authored Dec 25, 2024
2 parents 2b28931 + 865a361 commit 498cdfb
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 8 deletions.
2 changes: 1 addition & 1 deletion charts/cluster/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.2
version: 0.2.3

# 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
2 changes: 1 addition & 1 deletion charts/cluster/templates/cnf-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spec:
- name: FLEETBOARD_CLUSTERID
value: {{ .Values.cluster.clusterID }}
- name: FLEETBOARD_BOOTSTRAPTOKEN
value: re51os.131tn13kek2iaqoz
value: {{ .Values.hub.bootstraptoken }}
- name: FLEETBOARD_PODNAME
valueFrom:
fieldRef:
Expand Down
5 changes: 5 additions & 0 deletions charts/cluster/templates/rbac.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
---
apiVersion: v1
kind: Namespace
metadata:
name: fleetboard-system
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.serviceAccount.name }}
Expand Down
2 changes: 1 addition & 1 deletion charts/hub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0
version: 0.2.1

# 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
2 changes: 1 addition & 1 deletion charts/hub/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Your release is named {{ .Release.Name }}.

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

helm install fleetboard-agent fleetboard/fleetboard-agent --namespace fleetboard-system --create-namespace \
helm install fleetboard-agent fleetboard/fleetboard-agent --namespace fleetboard-system \
--set hub.hubURL=https://{{ .Values.tunnel.endpoint }}:6443 --set cluster.clusterID=cluster1
13 changes: 9 additions & 4 deletions charts/hub/templates/rbac.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
---
apiVersion: v1
kind: Namespace
metadata:
name: fleetboard-system
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.serviceAccount.name }}
Expand Down Expand Up @@ -85,15 +90,15 @@ type: bootstrap.kubernetes.io/token
stringData:
description: "The bootstrap token used by fleetboard network first connection."
# Token ID and secret. Required.
token-id: re51os
token-secret: 131tn13kek2iaqoz
token-id: "re51os"
token-secret: "131tn13kek2iaqoz"
# Expiration. Optional.
expiration: 2035-05-10T03:22:11Z
expiration: "2035-05-10T03:22:11Z"
# Allowed usages.
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:fleetboard:register-token
auth-extra-groups: "system:bootstrappers:fleetboard:register-token"
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand Down

0 comments on commit 498cdfb

Please sign in to comment.