Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
senthilrch committed Mar 19, 2021
2 parents 24803d4 + dad2216 commit 2ff2415
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ stages:
# This stage builds all four multi-arch images and pushes them to docker hub (only for PR builds)
- name: build_multiarch
if: type = push and branch = master
# This stage builds all four multi-arch images and pushes them to docker hub (only for release tags)
# This stage is a placeholder for future (only for release tags)
- name: build_release
if: tag IS present
jobs:
Expand All @@ -51,6 +51,4 @@ jobs:
- travis_wait 60 make release
- stage: build_release
script:
- echo "$DOCKERHUB_PSWD" | docker login --username "$DOCKERHUB_USER" --password-stdin
# BUILD_OUTPUT=--push requests buildx to push the built images to docker hub
- travis_wait 60 make release
- echo "Release tag pushed. nothing to do!!"
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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.
version: v0.7.1
version: v0.8.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: imagecaches.kubefledged.k8s.io
labels:
{{ include "kubefledged.labels" . | nindent 4 }}
spec:
group: kubefledged.k8s.io
versions:
Expand Down

0 comments on commit 2ff2415

Please sign in to comment.