Merge pull request #6 from openzipkin/fix-drift

Fixes drift since extracting from zipkin's core repo
openzipkin · Dec 31, 2023 · 49eaad7 · 49eaad7
2 parents ec6c5e9 + feb77c4
commit 49eaad7
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 26 deletions.
diff --git a/.github/workflows/helm_release.yml → .github/workflows/release.yml b/.github/workflows/helm_release.yml → .github/workflows/release.yml
@@ -1,12 +1,12 @@
-# yamllint --format github .github/workflows/helm_release.yml
+# yamllint --format github .github/workflows/release.yml
 ---
 name: helm_release
 
 # We release helm_charts into https://github.com/openzipkin/zipkin/blob/gh-pages/index.yaml
 
 on:
   push:
-    tags: "release-chart-[0-9]+.[0-9]+.[0-9]+**"
+    tags: "release-[0-9]+.[0-9]+.[0-9]+**"
 
 jobs:
   release:
@@ -20,7 +20,8 @@ jobs:
           git config user.name "$GITHUB_ACTOR"
           git config user.email "[email protected]"
 
-      - uses: oprypin/find-latest-tag@v1
+      - name: Get latest zipkin version
+        uses: oprypin/find-latest-tag@v1
         with:
           repository: openzipkin/zipkin
           releases-only: true
@@ -35,8 +36,6 @@ jobs:
 
       - name: Run chart-releaser
         uses: helm/[email protected]
-        with:
-          charts_dir: charts
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 

diff --git a/.github/workflows/helm_test.yml → .github/workflows/test.yml b/.github/workflows/helm_test.yml → .github/workflows/test.yml
@@ -1,14 +1,23 @@
-# yamllint --format github .github/workflows/helm_test.yml
+# yamllint --format github .github/workflows/test.yml
 ---
 name: helm_test
 
 # We test the helm chart including an apply following the steps described in
 # https://github.com/helm/chart-testing-action
 
+# We don't test documentation-only commits.
 on:
+  # We run tests on non-tagged pushes to master that aren't a commit made by the release plugin
+  push:
+    tags: ""
+    branches: master
+    paths-ignore:
+      - "**/*.md"
+  # We also run tests on pull requests targeted at the master branch.
   pull_request:
-    paths:
-      - "charts/**"
+    branches: master
+    paths-ignore:
+      - "**/*.md"
 
 jobs:
   lint:
@@ -25,11 +34,12 @@ jobs:
       - name: Set up Helm
         uses: azure/setup-helm@v3
         with:
-          version: v3.11.1
+          version: v3.12.1
 
-      - uses: actions/setup-python@v4
+      - name: Install python
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.10
+          python-version: '3.10'
 
       - name: Set up chart-testing
         uses: helm/[email protected]

diff --git a/Chart.yaml b/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2015-2022 The OpenZipkin Authors
+# Copyright 2023 The OpenZipkin Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -10,11 +10,11 @@
 # or implied. See the License for the specific language governing permissions and limitations under
 # the License.
 apiVersion: v2
-appVersion: 2.24.1
+appVersion: 2.26.0
 name: zipkin
 description: A Zipkin helm chart for kubernetes
 type: application
-version: 0.7.0
+version: 0.1.0
 maintainers:
   - name: openzipkin
     email: [email protected]
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Please refer to Helm's [documentation](https://helm.sh/docs/) to get started.
 Once Helm is set up properly, add the repo as follows:
 
 ```console
-helm repo add openzipkin https://openzipkin.github.io/zipkin
+helm repo add openzipkin https://openzipkin.github.io/zipkin-helm
 ```
 
 You can then run `helm search repo openzipkin` to see the charts.

diff --git a/templates/NOTES.txt b/templates/NOTES.txt
@@ -1,5 +1,5 @@
 {{- /*
-Copyright 2015-2022 The OpenZipkin Authors
+Copyright 2023 The OpenZipkin Authors
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 in compliance with the License. You may obtain a copy of the License at

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -1,5 +1,5 @@
 {{/*
-Copyright 2015-2022 The OpenZipkin Authors
+Copyright 2023 The OpenZipkin Authors
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 in compliance with the License. You may obtain a copy of the License at

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright 2015-2022 The OpenZipkin Authors
+Copyright 2023 The OpenZipkin Authors
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 in compliance with the License. You may obtain a copy of the License at

diff --git a/templates/hpa.yaml b/templates/hpa.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright 2015-2022 The OpenZipkin Authors
+Copyright 2023 The OpenZipkin Authors
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 in compliance with the License. You may obtain a copy of the License at

diff --git a/templates/ingress.yaml b/templates/ingress.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright 2015-2022 The OpenZipkin Authors
+Copyright 2023 The OpenZipkin Authors
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 in compliance with the License. You may obtain a copy of the License at

diff --git a/templates/psp.yaml b/templates/psp.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright 2015-2022 The OpenZipkin Authors
+Copyright 2023 The OpenZipkin Authors
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 in compliance with the License. You may obtain a copy of the License at

diff --git a/templates/role.yaml b/templates/role.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright 2015-2022 The OpenZipkin Authors
+Copyright 2023 The OpenZipkin Authors
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 in compliance with the License. You may obtain a copy of the License at

diff --git a/templates/rolebinding.yaml b/templates/rolebinding.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright 2015-2022 The OpenZipkin Authors
+Copyright 2023 The OpenZipkin Authors
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 in compliance with the License. You may obtain a copy of the License at

diff --git a/templates/service.yaml b/templates/service.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright 2015-2022 The OpenZipkin Authors
+Copyright 2023 The OpenZipkin Authors
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 in compliance with the License. You may obtain a copy of the License at

diff --git a/templates/serviceaccount.yaml b/templates/serviceaccount.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright 2015-2022 The OpenZipkin Authors
+Copyright 2023 The OpenZipkin Authors
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 in compliance with the License. You may obtain a copy of the License at

diff --git a/values.yaml b/values.yaml
@@ -1,4 +1,4 @@
-# Copyright 2015-2022 The OpenZipkin Authors
+# Copyright 2023 The OpenZipkin Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at