Merge pull request #523 from rewantsoni/macos

make the operator scripts compatible with mac

Author: Madhu-1

.github/workflows/build.yaml

@@ -16,14 +16,22 @@ permissions:
 jobs:
   build:
     name: build
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 1
       - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version-file: go.mod
+      - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
+        with:
+          python-version: '3.x'
+      - name: Install Python dependencies
+        run: pip install pyyaml
       - name: run make build
         run: make build
       - name: make build installer

.github/workflows/lint.yaml

@@ -39,7 +39,10 @@ jobs:
 
   golangci:
     name: golangci-lint
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -93,7 +96,10 @@ jobs:
 
   modcheck:
     name: modcheck
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -106,9 +112,15 @@ jobs:
 
   vendorcheck:
     name: vendorcheck
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+      with:
+        go-version-file: go.mod
     - name: Check the vendor folder consistency
       run: |
         go mod vendor -o vendor.gen

.github/workflows/unit-test.yaml

@@ -18,15 +18,18 @@ permissions:
 jobs:
     unittests:
       name: unittests
-      runs-on: ubuntu-latest
+      runs-on: ${{ matrix.os }}
+      strategy:
+        matrix:
+          os: [ubuntu-latest, macos-latest]
       steps:
-        - name: checkout     
+        - name: checkout
           uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
           with:
             fetch-depth: 1
-        - name: setup go    
+        - name: setup go
           uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
-          with: 
+          with:
             go-version-file: go.mod
             check-latest: true
         - name:  run unit tests

Makefile

@@ -354,6 +354,7 @@ set -e; \
 package=$(2)@$(3) ;\
 echo "Downloading $${package}" ;\
 GOBIN=$(LOCALBIN) go install $${package} ;\
-mv "$$(echo "$(1)" | sed "s/-$(3)$$//")" $(1) ;\
+tmp="$(1)" ;\
+mv "$${tmp%-$(3)}" $(1) ;\
 }
 endef

hack/patch-csi-operator-helm-chart.sh

@@ -13,26 +13,28 @@ if [ ! -f "$SA_FILE" ]; then
   exit 1
 fi
 
-TEMPLATE_SNIPPET=$(
-  cat <<'EOF'
-{{- with .Values.imagePullSecrets }}
-imagePullSecrets:
-{{ toYaml . | indent 2 }}
-{{- end }}
-EOF
-)
-
 echo "Patching $SA_FILE for imagePullSecrets"
 
-awk -v snippet="$TEMPLATE_SNIPPET" '
+# Use awk to insert the snippet before each '---' separator and at the end
+awk '
   # Before printing a separator, print the snippet
-  /^---/ { print snippet }
+  /^---/ {
+    print "{{- with .Values.imagePullSecrets }}"
+    print "imagePullSecrets:"
+    print "{{ toYaml . | indent 2 }}"
+    print "{{- end }}"
+  }
 
   # Print the current line
   { print }
 
   # At the end of the file, print the snippet for the last section
-  END { print snippet }
+  END {
+    print "{{- with .Values.imagePullSecrets }}"
+    print "imagePullSecrets:"
+    print "{{ toYaml . | indent 2 }}"
+    print "{{- end }}"
+  }
 ' "$SA_FILE" >"${SA_FILE}.tmp"
 
 mv "${SA_FILE}.tmp" "$SA_FILE"
@@ -51,12 +53,12 @@ if [[ "$CHART_DIR" == *"ceph-csi-operator"* ]]; then
 
       # Check if the file already has the $root variable definition
       if ! grep -q "{{- \$root := . -}}" "$file"; then
-        # Add the $root variable definition at the top of the file
-        sed -i "1i{{- \$root := . -}}" "$file"
+        # Add the $root variable definition at the top of the file using a temp file
+        echo "{{- \$root := . -}}" | cat - "$file" > "$file.tmp" && mv "$file.tmp" "$file"
       fi
 
-      # Replace the namespace string
-      sed -i "s/namespace: ceph-csi-operator-system/namespace: {{ \$root.Release.Namespace }}/g" "$file"
+      # Replace the namespace string using a temp file (portable across all platforms)
+      sed "s/namespace: ceph-csi-operator-system/namespace: {{ \$root.Release.Namespace }}/g" "$file" > "$file.tmp" && mv "$file.tmp" "$file"
     fi
   done