Update values.yaml

.github/workflows/release_docker_k8_operator.yaml

@@ -11,7 +11,25 @@ jobs:
       - name: Extract version from tag
         id: extract_version
         run: echo "::set-output name=version::${GITHUB_REF_NAME#infisical-k8-operator/}"
-      - uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+
+      - name: Install Helm
+        uses: azure/setup-helm@v3
+        with:
+          version: v3.10.0
+
+      - name: Install python
+        uses: actions/setup-python@v4
+        
+      - name: Generate Helm Chart
+        run: sh k8-operator/scripts/generate-helm.sh
+        
+      - name: Update Helm Chart Version
+        run: sh k8-operator/scripts/update-version.sh ${{ steps.extract_version.outputs.version }}
 
       - name: 🔧 Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -35,18 +53,22 @@ jobs:
           tags: |
             infisical/kubernetes-operator:latest
             infisical/kubernetes-operator:${{ steps.extract_version.outputs.version }}
-
+            
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install Helm
-        uses: azure/setup-helm@v3
-        with:
-          version: v3.10.0
-      - name: Install python
-        uses: actions/setup-python@v4
       - name: Install Cloudsmith CLI
-        run: pip install --upgrade cloudsmith-cli
+        run: pip install --upgrade cloudsmith-cli      
+
       - name: Build and push helm package to Cloudsmith
         run: cd helm-charts && sh upload-k8s-operator-cloudsmith.sh
         env:
           CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
+
+      - name: Configure Git
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+            
+      - name: Commit and Push Helm Changes
+        run: |
+          git add .
+          git commit -m "Update Helm chart to version ${{ steps.extract_version.outputs.version }}" || echo "No changes to commit"
+          git push

helm-charts/secrets-operator/templates/deployment.yaml

@@ -88,4 +88,4 @@ spec:
       serviceAccountName: {{ include "secrets-operator.fullname" . }}-controller-manager
       terminationGracePeriodSeconds: 10
       nodeSelector: {{ toYaml .Values.controllerManager.nodeSelector | nindent 8 }}
-      tolerations: {{ toYaml .Values.controllerManager.tolerations | nindent 8 }}
+      tolerations: {{ toYaml .Values.controllerManager.tolerations | nindent 8 }}

helm-charts/secrets-operator/templates/infisicaldynamicsecret-crd.yaml

@@ -309,4 +309,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-{{- end }}
+{{- end }}

helm-charts/secrets-operator/templates/infisicalpushsecret-crd.yaml

@@ -266,4 +266,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-{{- end }}
+{{- end }}

helm-charts/secrets-operator/templates/infisicalsecret-crd.yaml

@@ -504,5 +504,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-
+{{- end }}
-{{- end }}

helm-charts/secrets-operator/templates/manager-rbac.yaml

@@ -53,6 +53,15 @@ rules:
   - list
   - update
   - watch
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  verbs:
+  - get
+  - list
+  - update
+  - watch
 - apiGroups:
   - secrets.infisical.com
   resources:

helm-charts/secrets-operator/templates/metrics-reader-rbac.yaml

@@ -13,4 +13,4 @@ rules:
   - /metrics
   verbs:
   - get
-{{- end }}
+{{- end }}

helm-charts/secrets-operator/templates/metrics-service.yaml

@@ -12,6 +12,6 @@ spec:
   type: {{ .Values.metricsService.type }}
   selector:
     control-plane: controller-manager
-  {{- include "secrets-operator.selectorLabels" . | nindent 4 }}
+    {{- include "secrets-operator.selectorLabels" . | nindent 4 }}
   ports:
-	{{- .Values.metricsService.ports | toYaml | nindent 2 }}
+  {{- .Values.metricsService.ports | toYaml | nindent 2 }}

helm-charts/secrets-operator/templates/proxy-rbac.yaml

@@ -39,4 +39,4 @@ subjects:
 - kind: ServiceAccount
   name: '{{ include "secrets-operator.fullname" . }}-controller-manager'
   namespace: '{{ .Release.Namespace }}'
-{{- end }}
+{{- end }}

helm-charts/secrets-operator/values.yaml

@@ -45,10 +45,6 @@ controllerManager:
     annotations: {}
   nodeSelector: {}
   tolerations: []
-kubernetesClusterDomain: cluster.local
-scopedNamespace: ""
-scopedRBAC: false
-installCRDs: true
 metricsService:
   ports:
     - name: https
@@ -56,3 +52,7 @@ metricsService:
       protocol: TCP
       targetPort: https
   type: ClusterIP
+kubernetesClusterDomain: cluster.local
+scopedNamespace: ""
+scopedRBAC: false
+installCRDs: true

k8-operator/Makefile

@@ -48,9 +48,12 @@ helmify: $(HELMIFY) ## Download helmify locally if necessary.
 $(HELMIFY): $(LOCALBIN)
 	test -s $(LOCALBIN)/helmify || GOBIN=$(LOCALBIN) go install github.com/arttor/helmify/cmd/helmify@latest
     
-helm: manifests kustomize helmify
+legacy-helm: manifests kustomize helmify
 	$(KUSTOMIZE) build config/default | $(HELMIFY) ../helm-charts/secrets-operator
 
+helm: manifests kustomize helmify
+	./scripts/generate-helm.sh
+
 ## Yaml for Kubectl 
 kubectl-install: manifests kustomize
 	mkdir -p kubectl-install

k8-operator/scripts/generate-helm.sh

@@ -0,0 +1,311 @@
+#!/usr/bin/env bash
+set -euo pipefail
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+PROJECT_ROOT=$(cd "${SCRIPT_DIR}/.." && pwd)
+HELM_DIR="${PROJECT_ROOT}/../helm-charts/secrets-operator"
+LOCALBIN="${PROJECT_ROOT}/bin"
+KUSTOMIZE="${LOCALBIN}/kustomize"
+HELMIFY="${LOCALBIN}/helmify"
+
+
+cd "${PROJECT_ROOT}"
+# first run the regular helm target to generate base templates
+"${KUSTOMIZE}" build config/default | "${HELMIFY}" "${HELM_DIR}"
+
+
+
+# ? NOTE: Processes all files that end with crd.yaml (so only actual CRDs)
+for crd_file in "${HELM_DIR}"/templates/*crd.yaml; do
+  # skip if file doesn't exist (pattern doesn't match)
+  [ -e "$crd_file" ] || continue
+  
+  echo "Processing CRD file: ${crd_file}"
+  
+  cp "$crd_file" "$crd_file.bkp"
+  
+  # if we ever need to run conditional logic based on the CRD kind, we can use this
+  # CRD_KIND=$(grep -E "kind: [a-zA-Z]+" "$crd_file" | head -n1 | awk '{print $2}')
+  # echo "Found CRD kind: ${CRD_KIND}"
+  
+  # create a new file with the conditional statement, then append the entire original content
+  echo "{{- if .Values.installCRDs }}" > "$crd_file.new"
+  cat "$crd_file.bkp" >> "$crd_file.new"
+  
+  # make sure the file ends with a newline before adding the end tag (otherwise it might get messed up and end up on the same line as the last line)
+  # check if file already ends with a newline
+  if [ "$(tail -c1 "$crd_file.new" | wc -l)" -eq 0 ]; then
+    # File doesn't end with a newline, add one
+    echo "" >> "$crd_file.new"
+  fi
+  
+  # add the end tag on a new line
+  echo "{{- end }}" >> "$crd_file.new"
+  
+  # replace the original file with the new one
+  mv "$crd_file.new" "$crd_file"
+  
+  # clean up backup
+  rm "$crd_file.bkp"
+  
+  echo "Completed processing for: ${crd_file}"
+done
+
+# ? NOTE: Processes only the manager-rbac.yaml file
+if [ -f "${HELM_DIR}/templates/manager-rbac.yaml" ]; then
+  echo "Processing manager-rbac.yaml file specifically"
+
+
+  cp "${HELM_DIR}/templates/manager-rbac.yaml" "${HELM_DIR}/templates/manager-rbac.yaml.bkp"
+  
+  # extract the rules section from the original file
+  rules_section=$(sed -n '/^rules:/,/^---/p' "${HELM_DIR}/templates/manager-rbac.yaml.bkp" | sed '$d')
+  # extract the original label lines
+  original_labels=$(sed -n '/^  labels:/,/^roleRef:/p' "${HELM_DIR}/templates/manager-rbac.yaml.bkp" | grep "app.kubernetes.io")
+  
+  # create a new file from scratch with exactly what we want
+  {
+    # first section: Role/ClusterRole
+    echo "apiVersion: rbac.authorization.k8s.io/v1"
+    echo "{{- if and .Values.scopedNamespace .Values.scopedRBAC }}"
+    echo "kind: Role"
+    echo "{{- else }}"
+    echo "kind: ClusterRole"
+    echo "{{- end }}"
+    echo "metadata:"
+    echo "  name: {{ include \"secrets-operator.fullname\" . }}-manager-role"
+    echo "  {{- if and .Values.scopedNamespace .Values.scopedRBAC }}"
+    echo "  namespace: {{ .Values.scopedNamespace | quote }}"
+    echo "  {{- end }}"
+    echo "  labels:"
+    echo "  {{- include \"secrets-operator.labels\" . | nindent 4 }}"
+    
+    # add the existing rules section from helm-generated file
+    echo "$rules_section"
+    
+    # second section: RoleBinding/ClusterRoleBinding
+    echo "---"
+    echo "apiVersion: rbac.authorization.k8s.io/v1"
+    echo "{{- if and .Values.scopedNamespace .Values.scopedRBAC }}"
+    echo "kind: RoleBinding"
+    echo "{{- else }}"
+    echo "kind: ClusterRoleBinding"
+    echo "{{- end }}"
+    echo "metadata:"
+    echo "  name: {{ include \"secrets-operator.fullname\" . }}-manager-rolebinding"
+    echo "  {{- if and .Values.scopedNamespace .Values.scopedRBAC }}"
+    echo "  namespace: {{ .Values.scopedNamespace | quote }}"
+    echo "  {{- end }}"
+    echo "  labels:"
+    echo "$original_labels"
+    echo "  {{- include \"secrets-operator.labels\" . | nindent 4 }}"
+    
+    # add the roleRef section with custom logic
+    echo "roleRef:"
+    echo "  apiGroup: rbac.authorization.k8s.io"
+    echo "  {{- if and .Values.scopedNamespace .Values.scopedRBAC }}"
+    echo "  kind: Role"
+    echo "  {{- else }}"
+    echo "  kind: ClusterRole"
+    echo "  {{- end }}"
+    echo "  name: '{{ include \"secrets-operator.fullname\" . }}-manager-role'"
+    
+    # add the subjects section
+    sed -n '/^subjects:/,$ p' "${HELM_DIR}/templates/manager-rbac.yaml.bkp"
+  } > "${HELM_DIR}/templates/manager-rbac.yaml.new"
+  
+  mv "${HELM_DIR}/templates/manager-rbac.yaml.new" "${HELM_DIR}/templates/manager-rbac.yaml"
+  rm "${HELM_DIR}/templates/manager-rbac.yaml.bkp"
+  
+  echo "Completed processing for manager-rbac.yaml with both role conditions and metadata applied"
+fi
+
+# ? NOTE(Daniel): Processes proxy-rbac.yaml and metrics-reader-rbac.yaml
+for rbac_file in "${HELM_DIR}/templates/proxy-rbac.yaml" "${HELM_DIR}/templates/metrics-reader-rbac.yaml"; do
+  if [ -f "$rbac_file" ]; then
+    echo "Adding scopedNamespace condition to $(basename "$rbac_file")"
+    
+    {
+      echo "{{- if not .Values.scopedNamespace }}"
+      cat "$rbac_file"
+      echo ""
+      echo "{{- end }}"
+    } > "$rbac_file.new"
+    
+    mv "$rbac_file.new" "$rbac_file"
+    
+    echo "Completed processing for $(basename "$rbac_file")"
+  fi
+done
+
+
+
+# ? NOTE(Daniel): Processes deployment.yaml
+if [ -f "${HELM_DIR}/templates/deployment.yaml" ]; then
+  echo "Processing deployment.yaml file"
+
+  touch "${HELM_DIR}/templates/deployment.yaml.new"
+  
+  securityContext_replaced=0
+  in_first_securityContext=0
+  first_securityContext_found=0
+  
+  # process the file line by line
+  while IFS= read -r line; do
+    # check if this is the first securityContext line (for kube-rbac-proxy)
+    if [[ "$line" =~ securityContext.*Values.controllerManager.kubeRbacProxy ]] && [ "$first_securityContext_found" -eq 0 ]; then
+      echo "$line" >> "${HELM_DIR}/templates/deployment.yaml.new"
+      first_securityContext_found=1
+      in_first_securityContext=1
+      continue
+    fi
+    
+    # check if this is the args line after the first securityContext
+    if [ "$in_first_securityContext" -eq 1 ] && [[ "$line" =~ args: ]]; then
+      # Add our custom args section with conditional logic
+      echo "      - args:" >> "${HELM_DIR}/templates/deployment.yaml.new"
+      echo "        {{- toYaml .Values.controllerManager.manager.args | nindent 8 }}" >> "${HELM_DIR}/templates/deployment.yaml.new"
+      echo "        {{- if and .Values.scopedNamespace .Values.scopedRBAC }}" >> "${HELM_DIR}/templates/deployment.yaml.new"
+      echo "        - --namespace={{ .Values.scopedNamespace }}" >> "${HELM_DIR}/templates/deployment.yaml.new"
+      echo "        {{- end }}" >> "${HELM_DIR}/templates/deployment.yaml.new"
+      in_first_securityContext=0
+      continue
+    fi
+    
+    # check if this is the problematic pod securityContext line
+    if [[ "$line" =~ securityContext.*Values.controllerManager.podSecurityContext ]] && [ "$securityContext_replaced" -eq 0 ]; then
+      # Replace with our custom securityContext
+      echo "      securityContext:" >> "${HELM_DIR}/templates/deployment.yaml.new"
+      echo "        runAsNonRoot: true" >> "${HELM_DIR}/templates/deployment.yaml.new"
+      securityContext_replaced=1
+      continue
+    fi
+    
+    # check if this is the terminationGracePeriodSeconds line
+    if [[ "$line" == *"terminationGracePeriodSeconds:"* ]]; then
+      # output the current line
+      echo "$line" >> "${HELM_DIR}/templates/deployment.yaml.new"
+      # add our new lines
+      echo "      nodeSelector: {{ toYaml .Values.controllerManager.nodeSelector | nindent 8 }}" >> "${HELM_DIR}/templates/deployment.yaml.new"
+      echo "      tolerations: {{ toYaml .Values.controllerManager.tolerations | nindent 8 }}" >> "${HELM_DIR}/templates/deployment.yaml.new"
+      continue
+    fi
+    
+    # skip the line if it's just the trailing part of the replacement
+    if [[ "$securityContext_replaced" -eq 1 ]] && [[ "$line" =~ ^[[:space:]]*[0-9]+[[:space:]]*\}\} ]]; then
+      # this is the trailing part of the template expression, skip it
+      securityContext_replaced=0
+      continue
+    fi
+    
+    # skip the simplified args line that replaced our custom one
+    if [[ "$line" =~ args:.*Values.controllerManager.manager.args ]]; then
+      continue
+    fi
+    
+    echo "$line" >> "${HELM_DIR}/templates/deployment.yaml.new"
+  done < "${HELM_DIR}/templates/deployment.yaml"
+
+  echo "      terminationGracePeriodSeconds: 10" >> "${HELM_DIR}/templates/deployment.yaml.new"
+  echo "      nodeSelector: {{ toYaml .Values.controllerManager.nodeSelector | nindent 8 }}" >> "${HELM_DIR}/templates/deployment.yaml.new"
+  echo "      tolerations: {{ toYaml .Values.controllerManager.tolerations | nindent 8 }}" >> "${HELM_DIR}/templates/deployment.yaml.new"
+  
+  mv "${HELM_DIR}/templates/deployment.yaml.new" "${HELM_DIR}/templates/deployment.yaml"
+  echo "Completed processing for deployment.yaml"
+fi
+
+# ? NOTE(Daniel): Processes values.yaml
+if [ -f "${HELM_DIR}/values.yaml" ]; then
+  echo "Processing values.yaml file"
+  
+  # Create a temporary file
+  touch "${HELM_DIR}/values.yaml.new"
+  
+  # Flag to track sections
+  in_resources_section=0
+  in_service_account=0
+  
+  previous_line=""
+  # Process the file line by line
+  while IFS= read -r line; do
+
+    # Check if previous line includes infisical/kubernetes-operator and this line includes tag:
+    if [[ "$previous_line" =~ infisical/kubernetes-operator ]] && [[ "$line" =~ ^[[:space:]]*tag: ]]; then
+      # Get the indentation
+      indent=$(echo "$line" | sed 's/\(^[[:space:]]*\).*/\1/')
+      # Replace with our custom tag
+      echo "${indent}tag: <REPLACE-WITH-NEW-VERSION>" >> "${HELM_DIR}/values.yaml.new"
+      continue
+    fi
+
+
+    if [[ "$line" =~ resources: ]]; then
+      in_resources_section=1
+    fi
+    
+    if [[ "$line" =~ podSecurityContext: ]]; then
+      # skip this line and continue to the next line
+      continue
+    fi
+    
+    if [[ "$line" =~ runAsNonRoot: ]] && [ "$in_resources_section" -eq 1 ]; then
+      # also skip this line and continue to the next line
+      continue
+    fi
+    
+    if [[ "$line" =~ ^[[:space:]]*serviceAccount: ]]; then
+      # set the flag to 1 so we can continue to print the associated lines later 
+      in_service_account=1
+      # print the current line
+      echo "$line" >> "${HELM_DIR}/values.yaml.new"
+      continue
+    fi
+    
+    # process annotations under serviceAccount (only if in_service_account is true)
+    if [ "$in_service_account" -eq 1 ]; then
+      # Print the current line (annotations) 
+      echo "$line" >> "${HELM_DIR}/values.yaml.new"
+      
+      # if we've processed the annotations, add our new fields
+      if [[ "$line" =~ annotations: ]]; then
+        # get the base indentation level (of serviceAccount:)
+        base_indent=$(echo "$line" | sed 's/\(^[[:space:]]*\).*/\1/')
+        base_indent=${base_indent%??}  # Remove two spaces to get to parent level
+        
+        # add nodeSelector and tolerations at the same level as serviceAccount
+        echo "${base_indent}nodeSelector: {}" >> "${HELM_DIR}/values.yaml.new"
+        echo "${base_indent}tolerations: []" >> "${HELM_DIR}/values.yaml.new"
+      fi
+      
+      # exit serviceAccount section when we hit the next top-level item
+      if [[ "$line" =~ ^[[:space:]]{2}[a-zA-Z] ]] && ! [[ "$line" =~ annotations: ]]; then
+        in_service_account=0
+      fi
+      
+      continue
+    fi
+    
+    # if we reach this point, we'll exit the resources section, this is the next top-level item
+    if [ "$in_resources_section" -eq 1 ] && [[ "$line" =~ ^[[:space:]]{2}[a-zA-Z] ]]; then
+      in_resources_section=0
+    fi
+    
+    # output the line unchanged
+    echo "$line" >> "${HELM_DIR}/values.yaml.new"
+    previous_line="$line"
+  done < "${HELM_DIR}/values.yaml"
+  
+
+  # hacky, just append the kubernetesClusterDomain fields at the end of the file
+  sed -i '' '/kubernetesClusterDomain: /d' "${HELM_DIR}/values.yaml.new" # remove the existing kubernetesClusterDomain line if it exists somewhere
+  echo "kubernetesClusterDomain: cluster.local" >> "${HELM_DIR}/values.yaml.new"
+  echo "scopedNamespace: \"\"" >> "${HELM_DIR}/values.yaml.new"
+  echo "scopedRBAC: false" >> "${HELM_DIR}/values.yaml.new"
+  echo "installCRDs: true" >> "${HELM_DIR}/values.yaml.new"
+  
+  # replace the original file with the new one
+  mv "${HELM_DIR}/values.yaml.new" "${HELM_DIR}/values.yaml"
+  
+  echo "Completed processing for values.yaml"
+fi
+
+echo "Helm chart generation complete with custom templating applied."

k8-operator/scripts/update-version.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+PATH_TO_HELM_CHART="${SCRIPT_DIR}/../../helm-charts/secrets-operator"
+
+VERSION=$1
+VERSION_WITHOUT_V=$(echo "$VERSION" | sed 's/^v//') # needed to validate semver
+
+
+if [ -z "$VERSION" ]; then
+  echo "Usage: $0 <version>"
+  exit 1
+fi
+
+
+if ! [[ "$VERSION_WITHOUT_V" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+  echo "Error: Version must follow semantic versioning (e.g. 0.0.1)"
+  exit 1
+fi
+
+if ! [[ "$VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+  echo "Error: Version must start with 'v' (e.g. v0.0.1)"
+  exit 1
+fi
+
+
+
+
+sed -i '' -e '/repository: infisical\/kubernetes-operator/{n;s/tag: .*/tag: '"$VERSION"'/;}' "${PATH_TO_HELM_CHART}/values.yaml"
+
+# Update ../helm-charts/secrets-operator/Chart.yaml appVersion with the new version
+sed -i '' 's/appVersion: .*/appVersion: "'"$VERSION"'"/g' "${PATH_TO_HELM_CHART}/Chart.yaml"
+
+# Update ../helm-charts/secrets-operator/Chart.yaml version with the new version
+sed -i '' 's/version: .*/version: '"$VERSION"'/g' "${PATH_TO_HELM_CHART}/Chart.yaml"