Skip to content

Commit

Permalink
Merge branch 'main' into release-v1.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
nyuta01 authored Sep 2, 2021
2 parents d4521be + 6290c1a commit 721d152
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 0 additions & 2 deletions manifests/adservice/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,4 @@ resources:
images:
- name: adservice
newName: nyuta01/adservice
newTag: v1.1.2
- name: nyuta01/adservice
newTag: v1.2.1
2 changes: 0 additions & 2 deletions manifests/cartservice/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ resources:
images:
- name: cartservice
newName: nyuta01/cartservice
newTag: v1.1.2
- name: nyuta01/cartservice
newTag: v1.2.1
10 changes: 8 additions & 2 deletions manifests/cd/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ kind: Application
metadata:
name: adservice
annotations:
argocd-image-updater.argoproj.io/image-list: nyuta01/adservice:^1.0.0
argocd-image-updater.argoproj.io/image-list: adservice=nyuta01/adservice:^1.0.0
argocd-image-updater.argoproj.io/write-back-method: git:secret:argocd/private-repo
argocd-image-updater.argoproj.io/write-back-target: kustomization
argocd-image-updater.argoproj.io/adservice.kustomize.image-name: adservice
Expand All @@ -47,6 +47,9 @@ spec:
repoURL: [email protected]:nyuta01/argocd-demo.git
targetRevision: main
path: manifests/adservice
kustomize:
images:
- adservice=nyuta01/adservice
destination:
server: https://kubernetes.default.svc
namespace: default
Expand All @@ -60,7 +63,7 @@ kind: Application
metadata:
name: cartservice
annotations:
argocd-image-updater.argoproj.io/image-list: nyuta01/cartservice:^1.0.0
argocd-image-updater.argoproj.io/image-list: cartservice=nyuta01/cartservice:^1.0.0
argocd-image-updater.argoproj.io/write-back-method: git:secret:argocd/private-repo
argocd-image-updater.argoproj.io/write-back-target: kustomization
argocd-image-updater.argoproj.io/cartservice.kustomize.image-name: cartservice
Expand All @@ -70,6 +73,9 @@ spec:
repoURL: [email protected]:nyuta01/argocd-demo.git
targetRevision: main
path: manifests/cartservice
kustomize:
images:
- cartservice=nyuta01/cartservice
destination:
server: https://kubernetes.default.svc
namespace: default
Expand Down

0 comments on commit 721d152

Please sign in to comment.