Merge pull request #16 from KyriosGN0/helm-chart-ready

make the helm chart work out of the box with default airflow helm chart

Author: DrFaust92

README.md

@@ -196,7 +196,7 @@ Install the operator from an OCI registry.
 
 ```bash
 # install or upgrade the operator from an OCI chart reference
-helm upgrade --install airflow-operator oci://ghcr.io/drfaust92/charts/airflow-k8s-operator --namespace airflow-operator --create-namespace
+helm upgrade --install airflow-operator oci://ghcr.io/drfaust92/charts/airflow-k8s-operator --set operator.airflowHost=airflow.example.com --namespace airflow-operator --create-namespace
 ```
 
 ## Project Architecture

chart/airflow-k8s-operator/Chart.yaml

@@ -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.4.4
+version: 0.5.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

chart/airflow-k8s-operator/templates/NOTES.txt

@@ -0,0 +1 @@
+{{ required "operator.airflowHost is required" .Values.operator.airflowHost }}

chart/airflow-k8s-operator/templates/deployment.yaml

@@ -48,10 +48,24 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           env:
+            - name: AIRFLOW_HOST
+              value: {{ tpl .Values.operator.airflowHost . | quote }}
             {{- if .Values.livenessProbe }}
             - name: LIVENESS_PROBE
               value: {{ tpl .Values.operator.livenessProbeAddress . | quote }}
             {{- end }}
+            {{- if .Values.operator.basicAuthSecret.enabled }}
+            - name: AIRFLOW_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.operator.basicAuthSecret.secretName }}
+                  key: {{ .Values.operator.basicAuthSecret.usernameKey }}
+            - name: AIRFLOW_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.operator.basicAuthSecret.secretName }}
+                  key: {{ .Values.operator.basicAuthSecret.passwordKey }}
+            {{- end }}
             {{- with .Values.env }}
             {{- toYaml . | nindent 12 }}
             {{- end }}

chart/airflow-k8s-operator/templates/rbac.yaml

@@ -14,7 +14,7 @@ rules:
     resources: [secrets]
     verbs: [get, list, watch]
   - apiGroups: [airflow.drfaust92]
-    resources: [variables, connections]
+    resources: [variables, connections, pools]
     verbs: [list, watch, get]
 ---
 apiVersion: rbac.authorization.k8s.io/v1

chart/airflow-k8s-operator/templates/secret.yaml

@@ -0,0 +1,10 @@
+{{- if and .Values.operator.basicAuthSecret.enabled .Values.operator.basicAuthSecret.create }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.operator.basicAuthSecret.secretName }}
+type: Opaque
+data:
+  {{ .Values.operator.basicAuthSecret.usernameKey }}: {{ printf "admin" | b64enc }}
+  {{ .Values.operator.basicAuthSecret.passwordKey }}: {{ printf "admin" | b64enc }}
+{{- end }}

chart/airflow-k8s-operator/values.yaml

@@ -72,7 +72,7 @@ resources:
 # -- (map) liveness probe configuration
 livenessProbe:
   httpGet:
-    path: /
+    path: "/healthz"
     port: http
 
 # Additional volumes on the output Deployment definition.
@@ -135,5 +135,22 @@ affinity: {}
 port: 8080
 
 operator:
+  # -- (string) address for the operator
+  airflowHost: ""
+
+  basicAuthSecret:
+    # -- (bool) whether to use basic auth secrets
+    enabled: false
+    # -- (bool) whether to create the basic auth secret
+    # If set to false, you must provide a Kubernetes secret with the name specified in `secretName`.
+    # The secret must contain the keys specified in `usernameKey` and `passwordKey`.
+    # If the secret or keys do not exist, the deployment will fail.
+    create: false
+    # -- (string) name of the basic auth secret
+    secretName: "airflow-basic-auth"
+    # -- (string) key name for username in the secret
+    usernameKey: AIRFLOW_USERNAME
+    # -- (string) key name for password in the secret
+    passwordKey: AIRFLOW_PASSWORD
   # -- (string) liveness probe address for the operator
   livenessProbeAddress: "http://0.0.0.0:{{ .Values.port }}/healthz"