ashwin/nxtgauge-gitops
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: resolve merge conflict in kustomization.yaml

Browse source
This commit is contained in:
Tracewebstudio Dev 2026-04-15 13:50:45 +02:00
parent 3c521635d4
commit eebcec1465
23 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/nxtgauge-backend-rust/base/catering-services-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: catering-services - name: catering-services
image: registry.nxtgauge.com:5000/nxtgauge-rust-catering-services image: registry.nxtgauge.com/nxtgauge-rust-catering-services
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9115 - containerPort: 9115

2
apps/nxtgauge-backend-rust/base/companies-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: companies - name: companies
image: registry.nxtgauge.com:5000/nxtgauge-rust-companies image: registry.nxtgauge.com/nxtgauge-rust-companies
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9102 - containerPort: 9102

2
apps/nxtgauge-backend-rust/base/cron-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: cron - name: cron
image: registry.nxtgauge.com:5000/nxtgauge-rust-cron image: registry.nxtgauge.com/nxtgauge-rust-cron
imagePullPolicy: Always imagePullPolicy: Always
envFrom: envFrom:
- configMapRef: - configMapRef:

2
apps/nxtgauge-backend-rust/base/customers-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: customers - name: customers
image: registry.nxtgauge.com:5000/nxtgauge-rust-customers image: registry.nxtgauge.com/nxtgauge-rust-customers
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9105 - containerPort: 9105

2
apps/nxtgauge-backend-rust/base/developers-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: developers - name: developers
image: registry.nxtgauge.com:5000/nxtgauge-rust-developers image: registry.nxtgauge.com/nxtgauge-rust-developers
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9110 - containerPort: 9110

2
apps/nxtgauge-backend-rust/base/employees-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: employees - name: employees
image: registry.nxtgauge.com:5000/nxtgauge-rust-employees image: registry.nxtgauge.com/nxtgauge-rust-employees
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9106 - containerPort: 9106

2
apps/nxtgauge-backend-rust/base/fitness-trainers-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: fitness-trainers - name: fitness-trainers
image: registry.nxtgauge.com:5000/nxtgauge-rust-fitness-trainers image: registry.nxtgauge.com/nxtgauge-rust-fitness-trainers
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9114 - containerPort: 9114

2
apps/nxtgauge-backend-rust/base/gateway-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: gateway - name: gateway
image: registry.nxtgauge.com:5000/nxtgauge-rust-gateway image: registry.nxtgauge.com/nxtgauge-rust-gateway
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9100 - containerPort: 9100

2
apps/nxtgauge-backend-rust/base/graphic-designers-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: graphic-designers - name: graphic-designers
image: registry.nxtgauge.com:5000/nxtgauge-rust-graphic-designers image: registry.nxtgauge.com/nxtgauge-rust-graphic-designers
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9112 - containerPort: 9112

2
apps/nxtgauge-backend-rust/base/job-seekers-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: job-seekers - name: job-seekers
image: registry.nxtgauge.com:5000/nxtgauge-rust-job-seekers image: registry.nxtgauge.com/nxtgauge-rust-job-seekers
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9104 - containerPort: 9104

2
apps/nxtgauge-backend-rust/base/jobs-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: jobs - name: jobs
image: registry.nxtgauge.com:5000/nxtgauge-rust-jobs image: registry.nxtgauge.com/nxtgauge-rust-jobs
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9103 - containerPort: 9103

2
apps/nxtgauge-backend-rust/base/leads-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: leads - name: leads
image: registry.nxtgauge.com:5000/nxtgauge-rust-leads image: registry.nxtgauge.com/nxtgauge-rust-leads
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9118 - containerPort: 9118

2
apps/nxtgauge-backend-rust/base/makeup-artists-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: makeup-artists - name: makeup-artists
image: registry.nxtgauge.com:5000/nxtgauge-rust-makeup-artists image: registry.nxtgauge.com/nxtgauge-rust-makeup-artists
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9109 - containerPort: 9109

2
apps/nxtgauge-backend-rust/base/migration-job.yaml
View file

@ -19,7 +19,7 @@ spec:
restartPolicy: OnFailure restartPolicy: OnFailure
containers: containers:
- name: migrate - name: migrate
image: registry.nxtgauge.com:5000/nxtgauge-db-migrate:latest image: registry.nxtgauge.com/nxtgauge-db-migrate:latest
imagePullPolicy: Always imagePullPolicy: Always
envFrom: envFrom:
- secretRef: - secretRef:

2
apps/nxtgauge-backend-rust/base/payments-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: payments - name: payments
image: registry.nxtgauge.com:5000/nxtgauge-rust-payments image: registry.nxtgauge.com/nxtgauge-rust-payments
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9116 - containerPort: 9116

2
apps/nxtgauge-backend-rust/base/photographers-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: photographers - name: photographers
image: registry.nxtgauge.com:5000/nxtgauge-rust-photographers image: registry.nxtgauge.com/nxtgauge-rust-photographers
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9107 - containerPort: 9107

2
apps/nxtgauge-backend-rust/base/social-media-managers-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: social-media-managers - name: social-media-managers
image: registry.nxtgauge.com:5000/nxtgauge-rust-social-media-managers image: registry.nxtgauge.com/nxtgauge-rust-social-media-managers
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9113 - containerPort: 9113

2
apps/nxtgauge-backend-rust/base/tutors-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: tutors - name: tutors
image: registry.nxtgauge.com:5000/nxtgauge-rust-tutors image: registry.nxtgauge.com/nxtgauge-rust-tutors
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9108 - containerPort: 9108

2
apps/nxtgauge-backend-rust/base/ugc-content-creators-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: ugc-content-creators - name: ugc-content-creators
image: registry.nxtgauge.com:5000/nxtgauge-rust-ugc-content-creators image: registry.nxtgauge.com/nxtgauge-rust-ugc-content-creators
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9117 - containerPort: 9117

2
apps/nxtgauge-backend-rust/base/users-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: users - name: users
image: registry.nxtgauge.com:5000/nxtgauge-rust-users image: registry.nxtgauge.com/nxtgauge-rust-users
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9101 - containerPort: 9101

2
apps/nxtgauge-backend-rust/base/video-editors-deployment.yaml
View file

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: video-editors - name: video-editors
image: registry.nxtgauge.com:5000/nxtgauge-rust-video-editors image: registry.nxtgauge.com/nxtgauge-rust-video-editors
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 9111 - containerPort: 9111

40
apps/nxtgauge-backend-rust/overlays/prod/kustomization.yaml
View file

@ -8,43 +8,43 @@ patches:
kind: Deployment kind: Deployment
name: nxtgauge-rust-gateway name: nxtgauge-rust-gateway
images: images:
- name: registry.nxtgauge.com:5000/nxtgauge-rust-gateway - name: registry.nxtgauge.com/nxtgauge-rust-gateway
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-users - name: registry.nxtgauge.com/nxtgauge-rust-users
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-companies - name: registry.nxtgauge.com/nxtgauge-rust-companies
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-job-seekers - name: registry.nxtgauge.com/nxtgauge-rust-job-seekers
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-jobs - name: registry.nxtgauge.com/nxtgauge-rust-jobs
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-leads - name: registry.nxtgauge.com/nxtgauge-rust-leads
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-customers - name: registry.nxtgauge.com/nxtgauge-rust-customers
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-payments - name: registry.nxtgauge.com/nxtgauge-rust-payments
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-employees - name: registry.nxtgauge.com/nxtgauge-rust-employees
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-photographers - name: registry.nxtgauge.com/nxtgauge-rust-photographers
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-makeup-artists - name: registry.nxtgauge.com/nxtgauge-rust-makeup-artists
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-tutors - name: registry.nxtgauge.com/nxtgauge-rust-tutors
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-developers - name: registry.nxtgauge.com/nxtgauge-rust-developers
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-video-editors - name: registry.nxtgauge.com/nxtgauge-rust-video-editors
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-graphic-designers - name: registry.nxtgauge.com/nxtgauge-rust-graphic-designers
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-social-media-managers - name: registry.nxtgauge.com/nxtgauge-rust-social-media-managers
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-fitness-trainers - name: registry.nxtgauge.com/nxtgauge-rust-fitness-trainers
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-catering-services - name: registry.nxtgauge.com/nxtgauge-rust-catering-services
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-ugc-content-creators - name: registry.nxtgauge.com/nxtgauge-rust-ugc-content-creators
newTag: high-performance-latest newTag: high-performance-latest
- name: registry.nxtgauge.com:5000/nxtgauge-rust-cron - name: registry.nxtgauge.com/nxtgauge-rust-cron
newTag: high-performance-latest newTag: high-performance-latest

36
argocd/nxtgauge-backend-rust-application.yaml
View file

@ -5,24 +5,24 @@ metadata:
namespace: argocd namespace: argocd
annotations: annotations:
argocd-image-updater.argoproj.io/image-list: >- argocd-image-updater.argoproj.io/image-list: >-
gateway=registry.nxtgauge.com:5000/nxtgauge-rust-gateway:high-performance-latest, gateway=registry.nxtgauge.com/nxtgauge-rust-gateway:high-performance-latest,
users=registry.nxtgauge.com:5000/nxtgauge-rust-users:high-performance-latest, users=registry.nxtgauge.com/nxtgauge-rust-users:high-performance-latest,
companies=registry.nxtgauge.com:5000/nxtgauge-rust-companies:high-performance-latest, companies=registry.nxtgauge.com/nxtgauge-rust-companies:high-performance-latest,
job-seekers=registry.nxtgauge.com:5000/nxtgauge-rust-job-seekers:high-performance-latest, job-seekers=registry.nxtgauge.com/nxtgauge-rust-job-seekers:high-performance-latest,
customers=registry.nxtgauge.com:5000/nxtgauge-rust-customers:high-performance-latest, customers=registry.nxtgauge.com/nxtgauge-rust-customers:high-performance-latest,
payments=registry.nxtgauge.com:5000/nxtgauge-rust-payments:high-performance-latest, payments=registry.nxtgauge.com/nxtgauge-rust-payments:high-performance-latest,
employees=registry.nxtgauge.com:5000/nxtgauge-rust-employees:high-performance-latest, employees=registry.nxtgauge.com/nxtgauge-rust-employees:high-performance-latest,
photographers=registry.nxtgauge.com:5000/nxtgauge-rust-photographers:high-performance-latest, photographers=registry.nxtgauge.com/nxtgauge-rust-photographers:high-performance-latest,
makeup-artists=registry.nxtgauge.com:5000/nxtgauge-rust-makeup-artists:high-performance-latest, makeup-artists=registry.nxtgauge.com/nxtgauge-rust-makeup-artists:high-performance-latest,
tutors=registry.nxtgauge.com:5000/nxtgauge-rust-tutors:high-performance-latest, tutors=registry.nxtgauge.com/nxtgauge-rust-tutors:high-performance-latest,
developers=registry.nxtgauge.com:5000/nxtgauge-rust-developers:high-performance-latest, developers=registry.nxtgauge.com/nxtgauge-rust-developers:high-performance-latest,
video-editors=registry.nxtgauge.com:5000/nxtgauge-rust-video-editors:high-performance-latest, video-editors=registry.nxtgauge.com/nxtgauge-rust-video-editors:high-performance-latest,
graphic-designers=registry.nxtgauge.com:5000/nxtgauge-rust-graphic-designers:high-performance-latest, graphic-designers=registry.nxtgauge.com/nxtgauge-rust-graphic-designers:high-performance-latest,
social-media-managers=registry.nxtgauge.com:5000/nxtgauge-rust-social-media-managers:high-performance-latest, social-media-managers=registry.nxtgauge.com/nxtgauge-rust-social-media-managers:high-performance-latest,
fitness-trainers=registry.nxtgauge.com:5000/nxtgauge-rust-fitness-trainers:high-performance-latest, fitness-trainers=registry.nxtgauge.com/nxtgauge-rust-fitness-trainers:high-performance-latest,
catering-services=registry.nxtgauge.com:5000/nxtgauge-rust-catering-services:high-performance-latest, catering-services=registry.nxtgauge.com/nxtgauge-rust-catering-services:high-performance-latest,
ugc-content-creators=registry.nxtgauge.com:5000/nxtgauge-rust-ugc-content-creators:high-performance-latest, ugc-content-creators=registry.nxtgauge.com/nxtgauge-rust-ugc-content-creators:high-performance-latest,
cron=registry.nxtgauge.com:5000/nxtgauge-rust-cron:high-performance-latest cron=registry.nxtgauge.com/nxtgauge-rust-cron:high-performance-latest
argocd-image-updater.argoproj.io/gateway.update-strategy: digest argocd-image-updater.argoproj.io/gateway.update-strategy: digest
argocd-image-updater.argoproj.io/gateway.allow-tags: regexp:^high-performance-latest$ argocd-image-updater.argoproj.io/gateway.allow-tags: regexp:^high-performance-latest$
argocd-image-updater.argoproj.io/users.update-strategy: digest argocd-image-updater.argoproj.io/users.update-strategy: digest