diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 55c8b56e..1f89c368 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,7 +16,7 @@ jobs: go-version: 1.20.x - name: Unit Test run: | - make test-all-backend test-operator + make test-all-backend - name: Long Test run: | make testlong @@ -78,8 +78,8 @@ jobs: with: version: latest args: release --skip-publish --rm-dist --snapshot - - name: Operator - run: cd operator && make build + # - name: Operator + # run: cd operator && make build BuildImage: runs-on: ubuntu-20.04 @@ -116,8 +116,8 @@ jobs: sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose sudo chmod u+x /usr/local/bin/docker-compose make test-e2e - - name: Operator Image - run: cd operator && make docker-build + # - name: Operator Image + # run: cd operator && make docker-build BuildEmbedUI: runs-on: ubuntu-20.04 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 542c984e..2e439851 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -49,14 +49,13 @@ jobs: go-version: 1.20.x - name: Unit Test run: | - make test-all-backend test-operator + make test-all-backend - name: Report if: github.actor == 'linuxsuren' env: CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }} run: | bash <(curl -Ls https://coverage.codacy.com/get.sh) report --partial --force-coverage-parser go -r coverage.out - bash <(curl -Ls https://coverage.codacy.com/get.sh) report --partial --force-coverage-parser go -r operator/cover.out bash <(curl -Ls https://coverage.codacy.com/get.sh) final image: @@ -97,36 +96,36 @@ jobs: cache-to: type=gha,mode=max build-args: VERSION=${{ steps.vars.outputs.tag }} - image-operator: - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Setup Docker buildx - uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf - - name: Log into registry ${{ env.REGISTRY }} - if: github.event_name != 'pull_request' - uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GH_PUBLISH_SECRETS }} - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.REGISTRY }}/linuxsuren/api-testing-operator - - name: Build and push Docker image - id: build-and-push - uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a - with: - context: operator - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - platforms: linux/amd64,linux/arm64 - cache-from: type=gha - cache-to: type=gha,mode=max + # image-operator: + # runs-on: ubuntu-20.04 + # steps: + # - name: Checkout + # uses: actions/checkout@v4 + # - name: Setup Docker buildx + # uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf + # - name: Log into registry ${{ env.REGISTRY }} + # if: github.event_name != 'pull_request' + # uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c + # with: + # registry: ${{ env.REGISTRY }} + # username: ${{ github.actor }} + # password: ${{ secrets.GH_PUBLISH_SECRETS }} + # - name: Extract Docker metadata + # id: meta + # uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + # with: + # images: ${{ env.REGISTRY }}/linuxsuren/api-testing-operator + # - name: Build and push Docker image + # id: build-and-push + # uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a + # with: + # context: operator + # push: ${{ github.event_name != 'pull_request' }} + # tags: ${{ steps.meta.outputs.tags }} + # labels: ${{ steps.meta.outputs.labels }} + # platforms: linux/amd64,linux/arm64 + # cache-from: type=gha + # cache-to: type=gha,mode=max image-dockerhub: runs-on: ubuntu-20.04 diff --git a/helm/api-testing/Chart.yaml b/helm/api-testing/Chart.yaml index dc41418f..dc18144a 100644 --- a/helm/api-testing/Chart.yaml +++ b/helm/api-testing/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: v0.0.3 +version: v0.0.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.13" +appVersion: "v0.0.15" diff --git a/operator/Makefile b/operator/Makefile index 1704614e..a5a503c0 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -209,7 +209,7 @@ $(CONTROLLER_GEN): $(LOCALBIN) .PHONY: envtest envtest: $(ENVTEST) ## Download envtest-setup locally if necessary. $(ENVTEST): $(LOCALBIN) - test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest + test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.17.3 .PHONY: operator-sdk OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk