Merge branch 'master' into v1.1.x

trickstercache · May 5, 2020 · 6ff69a5 · 6ff69a5
2 parents e0d9703 + 2093f38
commit 6ff69a5
Show file tree

Hide file tree

Showing 5 changed files with 316 additions and 6 deletions.
diff --git a/.github/workflows/publish-beta-release.yaml b/.github/workflows/publish-beta-release.yaml
@@ -0,0 +1,103 @@
+on:
+  push:
+    tags:
+    - 'v[0-9]+\.[0-9]+\.[0-9]+-beta[0-9]+'
+
+name: Publish Trickster Beta Release to GitHub and Docker Hub
+
+jobs:
+  build:
+    name: Publish Release Candidate
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+      - name: Get bare tag
+        id: baretag
+        run: echo "::set-output name=baretag::$(echo ${{ github.ref }} | cut -b 12-)"
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Build project
+        run: |
+          TAGVER=${{ steps.baretag.outputs.baretag }} make release
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release v${{ steps.baretag.outputs.baretag }} / ${{ steps.date.outputs.date }}
+          draft: false
+          prerelease: true
+      - name: Upload Release Asset (linux-amd64)
+        id: upload-release-asset-linux-amd64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./OPATH/trickster-${{ steps.baretag.outputs.baretag }}.linux-amd64.tar.gz
+          asset_name: trickster-${{ steps.baretag.outputs.baretag }}.linux-amd64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset (linux-arm64)
+        id: upload-release-asset-linux-arm64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./OPATH/trickster-${{ steps.baretag.outputs.baretag }}.linux-arm64.tar.gz
+          asset_name: trickster-${{ steps.baretag.outputs.baretag }}.linux-arm64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset (darwin-amd64)
+        id: upload-release-asset-darwin-amd64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./OPATH/trickster-${{ steps.baretag.outputs.baretag }}.darwin-amd64.tar.gz
+          asset_name: trickster-${{ steps.baretag.outputs.baretag }}.darwin-amd64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset (windows-amd64)
+        id: upload-release-asset-windows-amd64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./OPATH/trickster-${{ steps.baretag.outputs.baretag }}.windows-amd64.tar.gz
+          asset_name: trickster-${{ steps.baretag.outputs.baretag }}.windows-amd64.tar.gz
+          asset_content_type: application/gzip
+      - name: build-push-tricksterio-amd
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: tricksterio/trickster
+          tags: ${{ steps.baretag.outputs.baretag }}
+      - name: build-push-tricksterproxy-amd
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: tricksterproxy/trickster
+          tags: ${{ steps.baretag.outputs.baretag }}
+      - name: build-push-tricksterio-arm
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: tricksterio/trickster
+          build_args: IMAGE_ARCH=arm64v8,GOARCH=arm64
+          tags: arm64v8-${{ steps.baretag.outputs.baretag }}
+      - name: build-push-tricksterproxy-arm
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: tricksterproxy/trickster
+          build_args: IMAGE_ARCH=arm64v8,GOARCH=arm64
+          tags: arm64v8-${{ steps.baretag.outputs.baretag }}
diff --git a/.github/workflows/publish-release-candidate.yaml b/.github/workflows/publish-release-candidate.yaml
@@ -0,0 +1,103 @@
+on:
+  push:
+    tags:
+    - 'v[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+'
+
+name: Publish Trickster Release Candidate to GitHub and Docker Hub
+
+jobs:
+  build:
+    name: Publish Release Candidate
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+      - name: Get bare tag
+        id: baretag
+        run: echo "::set-output name=baretag::$(echo ${{ github.ref }} | cut -b 12-)"
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Build project
+        run: |
+          TAGVER=${{ steps.baretag.outputs.baretag }} make release
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release v${{ steps.baretag.outputs.baretag }} / ${{ steps.date.outputs.date }}
+          draft: false
+          prerelease: true
+      - name: Upload Release Asset (linux-amd64)
+        id: upload-release-asset-linux-amd64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./OPATH/trickster-${{ steps.baretag.outputs.baretag }}.linux-amd64.tar.gz
+          asset_name: trickster-${{ steps.baretag.outputs.baretag }}.linux-amd64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset (linux-arm64)
+        id: upload-release-asset-linux-arm64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./OPATH/trickster-${{ steps.baretag.outputs.baretag }}.linux-arm64.tar.gz
+          asset_name: trickster-${{ steps.baretag.outputs.baretag }}.linux-arm64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset (darwin-amd64)
+        id: upload-release-asset-darwin-amd64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./OPATH/trickster-${{ steps.baretag.outputs.baretag }}.darwin-amd64.tar.gz
+          asset_name: trickster-${{ steps.baretag.outputs.baretag }}.darwin-amd64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset (windows-amd64)
+        id: upload-release-asset-windows-amd64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./OPATH/trickster-${{ steps.baretag.outputs.baretag }}.windows-amd64.tar.gz
+          asset_name: trickster-${{ steps.baretag.outputs.baretag }}.windows-amd64.tar.gz
+          asset_content_type: application/gzip
+      - name: build-push-tricksterio-amd
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: tricksterio/trickster
+          tags: ${{ steps.baretag.outputs.baretag }}
+      - name: build-push-tricksterproxy-amd
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: tricksterproxy/trickster
+          tags: ${{ steps.baretag.outputs.baretag }}
+      - name: build-push-tricksterio-arm
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: tricksterio/trickster
+          build_args: IMAGE_ARCH=arm64v8,GOARCH=arm64
+          tags: arm64v8-${{ steps.baretag.outputs.baretag }}
+      - name: build-push-tricksterproxy-arm
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: tricksterproxy/trickster
+          build_args: IMAGE_ARCH=arm64v8,GOARCH=arm64
+          tags: arm64v8-${{ steps.baretag.outputs.baretag }}
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -0,0 +1,103 @@
+on:
+  push:
+    tags:
+    - 'v[0-9]+\.[0-9]+\.[0-9]+' 
+
+name: Publish Trickster Release to GitHub and Docker Hub
+
+jobs:
+  build:
+    name: Publish Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+      - name: Get bare tag
+        id: baretag
+        run: echo "::set-output name=baretag::$(echo ${{ github.ref }} | cut -b 12-)"
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Build project
+        run: |
+          TAGVER=${{ steps.baretag.outputs.baretag }} make release
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release v${{ steps.baretag.outputs.baretag }} / ${{ steps.date.outputs.date }}
+          draft: false
+          prerelease: false
+      - name: Upload Release Asset (linux-amd64)
+        id: upload-release-asset-linux-amd64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./OPATH/trickster-${{ steps.baretag.outputs.baretag }}.linux-amd64.tar.gz
+          asset_name: trickster-${{ steps.baretag.outputs.baretag }}.linux-amd64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset (linux-arm64)
+        id: upload-release-asset-linux-arm64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./OPATH/trickster-${{ steps.baretag.outputs.baretag }}.linux-arm64.tar.gz
+          asset_name: trickster-${{ steps.baretag.outputs.baretag }}.linux-arm64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset (darwin-amd64)
+        id: upload-release-asset-darwin-amd64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./OPATH/trickster-${{ steps.baretag.outputs.baretag }}.darwin-amd64.tar.gz
+          asset_name: trickster-${{ steps.baretag.outputs.baretag }}.darwin-amd64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset (windows-amd64)
+        id: upload-release-asset-windows-amd64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./OPATH/trickster-${{ steps.baretag.outputs.baretag }}.windows-amd64.tar.gz
+          asset_name: trickster-${{ steps.baretag.outputs.baretag }}.windows-amd64.tar.gz
+          asset_content_type: application/gzip
+      - name: build-push-tricksterio-amd
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: tricksterio/trickster
+          tags: ${{ steps.baretag.outputs.baretag }}
+      - name: build-push-tricksterproxy-amd
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: tricksterproxy/trickster
+          tags: ${{ steps.baretag.outputs.baretag }}
+      - name: build-push-tricksterio-arm
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: tricksterio/trickster
+          build_args: IMAGE_ARCH=arm64v8,GOARCH=arm64
+          tags: arm64v8-${{ steps.baretag.outputs.baretag }}
+      - name: build-push-tricksterproxy-arm
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: tricksterproxy/trickster
+          build_args: IMAGE_ARCH=arm64v8,GOARCH=arm64
+          tags: arm64v8-${{ steps.baretag.outputs.baretag }}
diff --git a/cmd/trickster/main.go b/cmd/trickster/main.go
@@ -33,7 +33,7 @@ var (
 
 const (
 	applicationName    = "trickster"
-	applicationVersion = "1.1.0"
+	applicationVersion = "1.1.0-beta1"
 )
 
 var fatalStartupErrors = true

diff --git a/docs/roadmap.md b/docs/roadmap.md
@@ -10,15 +10,16 @@ The roadmap for Trickster in 2020 focuses on delivering incremental enhancements
 - [ ] Register Official Docker Hub Repositories
 - [x] Submit Helm charts to Helm Hub
 - [ ] Submit Trickster for CNCF Sandbox Consideration
-- [ ] Trickster v1.1 Release
+- [x] Trickster v1.1 Release
+  - [x] Relocate project to `tricksterproxy` organization
   - [x] Release Binaries for Windows
   - [x] Change default frontend listen port to 8480
   - [x] Frontend HTTP 2.0 Support
-  - [ ] Rules-based Request Routing and Rewriting
-  - [ ] Use RWMutex for cache synchronization
-  - [ ] Reload configuration without process restart
+  - [x] Rules-based Request Routing and Rewriting
+  - [x] Use RWMutex for cache synchronization
+  - [x] Reload configuration without process restart
   - [x] Add implementation-specific Tracing options in config
-  - [ ] Additional performance improvements
+  - [x] Additional performance improvements
   - [x] Relocate and merge PromSim and RangeSim into a separate repo called [mockster](https://github.com/tricksterproxy/mockster)
   - [x] Relocate Helm charts to a [separate repo](https://github.com/tricksterproxy/helm-charts)
   - [x] Automate Helm chart releases via GitHub Workflows