Merge pull request openyurtio#98 from njucjc/fix-link

Fix: helm chart support forward-node-ip value
njucjc · Mar 20, 2023 · 9f05184 · 9f05184
2 parents ea81ea8 + 241b661
commit 9f05184
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/charts/raven-agent/templates/config.yaml b/charts/raven-agent/templates/config.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 data:
   vpn-driver: {{ .Values.vpn.driver }}
+  forward-node-ip: {{ .Values.vpn.forward-node-ip }}
 kind: ConfigMap
 metadata:
   name: raven-agent-config

diff --git a/charts/raven-agent/values.yaml b/charts/raven-agent/values.yaml
@@ -60,8 +60,14 @@ containerEnv:
         configMapKeyRef:
           key: vpn-driver
           name: raven-agent-config
+    - name: FORWARD_NODE_IP
+      valueFrom:
+        configMapKeyRef:
+          key: forward-node-ip
+          name: raven-agent-config
 vpn:
   driver: libreswan
+  forward-node-ip: false
   # raven-agent requires a unique vpn psk
   # You can generate one with the command:
   # 'openssl rand -hex 64'

diff --git a/docs/raven-agent-tutorial.md b/docs/raven-agent-tutorial.md
@@ -19,7 +19,7 @@ wlcb-node1   Ready    <none>   20d   v1.16.2   10.48.115.11
 wlcb-node2   Ready    <none>   20d   v1.16.2   10.48.115.12    
 ```
 
-We use a [Gateway](https://github.com/openyurtio/openyurt/blob/raven-controller-manager/pkg/apis/raven/v1alpha1/gateway_types.go) CR to manage nodes in different physical regions, and label nodes to indicate which `Gateway` these nodes are managed by.
+We use a [Gateway](https://github.com/openyurtio/openyurt/blob/master/pkg/apis/raven/v1alpha1/gateway_types.go) CR to manage nodes in different physical regions, and label nodes to indicate which `Gateway` these nodes are managed by.
 
 For example, We label nodes in region `cn-huhehaote` with value `gw-hhht`, indicating that these nodes are managed by the `gw-hhht` gateway.