Fix ports (#14)

Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>
craftypath · Feb 23, 2021 · f339dac · f339dac
1 parent c18126d
commit f339dac
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 24 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -8,22 +8,38 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
-      - name: Fetch history
-        run: git fetch --prune --unshallow
+      - name: Set up Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.5.2
 
-      - name: Run 'ct lint'
-        id: lint
-        uses: helm/chart-testing-action@v1.0.0-rc.2
+      # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
+      # yamllint (https://github.com/adrienverge/yamllint) which require Python
+      - name: Set up Python
+        uses: actions/setup-python@v2
         with:
-          command: lint
+          python-version: 3.7
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.0.1
+
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed --config ct.yaml)
+          if [[ -n "$changed" ]]; then
+            echo "::set-output name=changed::true"
+          fi
+
+      - name: Run chart-testing (lint)
+        run: ct lint --config ct.yaml
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.0.0-rc.1
-        if: steps.lint.outputs.changed == 'true'
+        uses: helm/kind-action@v1.1.0
+        if: steps.list-changed.outputs.changed == 'true'
 
-      - name: Run 'ct install'
-        uses: helm/chart-testing-action@v1.0.0-rc.2
-        if: steps.lint.outputs.changed == 'true'
-        with:
-          command: install
+      - name: Run chart-testing (install)
+        run: ct install --config ct.yaml
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -11,22 +11,22 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-
-      - name: Fetch history
-        run: git fetch --prune --unshallow
+        with:
+          fetch-depth: 0
 
       - name: Configure Git
         run: |
           git config user.name "$GITHUB_ACTOR"
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Install Helm
-        run: |
-          curl -fsSLo get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
-          chmod 700 get_helm.sh
-          ./get_helm.sh
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.5.2
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.0.0-rc.2
+        uses: helm/chart-releaser-action@v1.2.0
+        with:
+          charts_dir: charts
         env:
-          CR_TOKEN: "${{ secrets.CR_TOKEN }}"
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/charts/sops-operator/Chart.yaml b/charts/sops-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sops-operator
 description: A Helm chart for SOPS Operator
 type: application
-version: 0.7.1
+version: 0.7.2
 appVersion: v0.7.0
 keywords:
   - SOPS

diff --git a/charts/sops-operator/templates/deployment.yaml b/charts/sops-operator/templates/deployment.yaml
@@ -65,9 +65,16 @@ spec:
                 name: {{ include "sops-operator.secretName" . }}
           {{- end }}
           {{- end }}
+          ports:
+            - name: http-metrics
+              containerPort: 8383
+              protocol: TCP
+            - name: cr-metrics
+              containerPort: 8686
+              protocol: TCP
           readinessProbe:
             httpGet:
-              port: 8686
+              port: http-metrics
               path: /metrics
           resources:
             {{- toYaml .Values.resources | nindent 12 }}