Merge pull request #9

replace-haproxy-configurator

Author: bear-san

deploy/haproxy-ccm/Chart.yaml

@@ -6,7 +6,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.0
+version: 0.1.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

deploy/haproxy-ccm/README.md

@@ -0,0 +1,140 @@
+# HAProxy Cloud Controller Manager Helm Chart
+
+This Helm chart deploys the HAProxy Cloud Controller Manager (CCM) for Kubernetes.
+
+## Configuration
+
+### Basic Configuration
+
+The chart supports configuration through the `values.yaml` file. Here are the key configuration options:
+
+### Image Configuration
+
+```yaml
+image:
+  name: bearsan/haproxy-ccm
+  tag: 0.1.0
+  useImagePullSecret:
+    enabled: false
+    name: ""
+```
+
+### Environment Variables
+
+```yaml
+env:
+  useExistsSecret:
+    enabled: false
+    secretRef:
+      baseUrl:
+        name: ""
+        key: ""
+      auth:
+        name: ""
+        key: ""
+  baseUrl: ""
+  auth: ""
+```
+
+### Command Line Arguments
+
+You can customize the command line arguments passed to the HAProxy CCM:
+
+```yaml
+args:
+  # Cloud provider specific arguments
+  cloudProvider: "haproxy"
+  
+  # Additional custom arguments (list format)
+  additional: []
+```
+
+## Usage Examples
+
+### Basic Deployment
+
+```bash
+helm install haproxy-ccm ./deploy/haproxy-ccm \
+  --set env.baseUrl="http://haproxy:5555" \
+  --set env.auth="admin:password"
+```
+
+### Deployment with Additional Arguments
+
+```yaml
+# custom-values.yaml
+env:
+  baseUrl: "grpc://haproxy-manager:50051"
+
+args:
+  additional:
+    - "--log-level=debug"
+    - "--bind-address=0.0.0.0"
+    - "--port=10258"
+    - "--haproxy-endpoint=grpc://haproxy-manager:50051"
+```
+
+```bash
+helm install haproxy-ccm ./deploy/haproxy-ccm -f custom-values.yaml
+```
+
+### Using Existing Secrets
+
+```yaml
+# secret-values.yaml
+env:
+  useExistsSecret:
+    enabled: true
+    secretRef:
+      baseUrl:
+        name: "haproxy-config"
+        key: "endpoint"
+      auth:
+        name: "haproxy-config"
+        key: "auth"
+
+args:
+  additional:
+    - "--v=4"
+    - "--leader-elect=true"
+```
+
+```bash
+helm install haproxy-ccm ./deploy/haproxy-ccm -f secret-values.yaml
+```
+
+## Common Additional Arguments
+
+Here are some commonly used additional arguments:
+
+- `--log-level=debug`: Set log level to debug
+- `--bind-address=0.0.0.0`: Bind address for the CCM server
+- `--port=10258`: Port for the CCM server
+- `--haproxy-endpoint=<endpoint>`: Override HAProxy endpoint (alternative to env var)
+- `--v=4`: Set verbosity level
+- `--leader-elect=true`: Enable leader election for HA deployments
+- `--cloud-config=<path>`: Path to cloud configuration file
+- `--allocate-node-cidrs=false`: Disable node CIDR allocation
+- `--configure-cloud-routes=false`: Disable cloud route configuration
+
+## Installation
+
+1. Clone the repository
+2. Configure your `values.yaml` or use `--set` flags
+3. Install the chart:
+
+```bash
+helm install haproxy-ccm ./deploy/haproxy-ccm
+```
+
+## Upgrading
+
+```bash
+helm upgrade haproxy-ccm ./deploy/haproxy-ccm
+```
+
+## Uninstallation
+
+```bash
+helm uninstall haproxy-ccm
+```

deploy/haproxy-ccm/templates/deployments.yaml

@@ -17,25 +17,30 @@ spec:
         image: {{ .Values.image.name }}:{{ .Values.image.tag }}
         env:
           - name: HAPROXY_ENDPOINT
-            {{ if .Values.env.useExistsSecret.enabled }}
+            {{- if .Values.env.useExistsSecret.enabled }}
             valueFrom:
               secretKeyRef:
                 name: {{ .Values.env.useExistsSecret.secretRef.baseUrl.name }}
                 key: {{ .Values.env.useExistsSecret.secretRef.baseUrl.key }}
-            {{ else }}
-            value: {{ .Values.env.baseUrl }}
-            {{ end }}
+            {{- else }}
+            value: {{ .Values.env.baseUrl | quote }}
+            {{- end }}
+          {{- if or .Values.env.useExistsSecret.enabled .Values.env.auth }}
           - name: HAPROXY_AUTH
-            {{ if .Values.env.useExistsSecret.enabled }}
+            {{- if .Values.env.useExistsSecret.enabled }}
             valueFrom:
               secretKeyRef:
                 name: {{ .Values.env.useExistsSecret.secretRef.auth.name }}
                 key: {{ .Values.env.useExistsSecret.secretRef.auth.key }}
-            {{ else }}
-            value: {{ .Values.env.auth }}
-            {{ end }}
+            {{- else }}
+            value: {{ .Values.env.auth | quote }}
+            {{- end }}
+          {{- end }}
         args:
-          - --cloud-provider=haproxy
+          - --cloud-provider={{ .Values.args.cloudProvider }}
+          {{- range .Values.args.additional }}
+          - {{ . }}
+          {{- end }}
       serviceAccountName: haproxy-ccm
       {{ if .Values.image.useImagePullSecret.enabled }}
       imagePullSecrets:

deploy/haproxy-ccm/values.yaml

@@ -16,3 +16,15 @@ env:
         key: ""
   baseUrl: ""
   auth: ""
+
+# Additional command line arguments for haproxy-ccm
+args:
+  # Cloud provider specific arguments
+  cloudProvider: "haproxy"
+  
+  # Additional custom arguments (list format)
+  # Example:
+  # - "--log-level=debug"
+  # - "--bind-address=0.0.0.0"
+  # - "--port=10258"
+  additional: []