Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow using custom harbor repository in tmf&tapm #165

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

allow using custom harbor repository in tmf&tapm #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a10326
allow using custom harbor repository in tmf&tapm
Nov 13, 2023
1340319
Fix the error of create configmap when install tmf component
Dec 8, 2023
2c3c169
To remove the component crd for compatibility with u4a 5.7
Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/apm-component/charts/apm-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
replicaCount: 1

image:
registry: 192.168.90.214
repository: system_containers/apm-api
registry: 192.168.90.214/system_containers
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why harcode registry to 192.168.90.214?

repository: apm-api
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "v5.6.0"
Expand Down
4 changes: 3 additions & 1 deletion charts/apm-component/charts/apm-operator/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ spec:
valueFrom:
secretKeyRef:
key: password
name: pkcs12-password-secret
name: pkcs12-password-secret
- name: HARBOR_URL
value: {{ .Values.image.registry }}
volumeMounts:
- mountPath: /etc/localtime
name: localtime
Expand Down
4 changes: 2 additions & 2 deletions charts/apm-component/charts/apm-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
replicaCount: 1

image:
registry: 192.168.90.214
repository: system_containers/apm-operator-server
registry: 192.168.90.214/system_containers
repository: apm-operator-server
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "v5.6.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/apm-component/charts/apm-portal/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
replicaCount: 1

image:
registry: 192.168.90.214
repository: system_containers/apm-portal
registry: 192.168.90.214/system_containers
repository: apm-portal
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "v5.6.0"
Expand Down
8 changes: 4 additions & 4 deletions charts/apm-component/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ global:
host: true

registry: &registry
docker.io
docker.io/refar
# Ingress host name
ingressHostName: &ingressHostName
'portal.192.168.90.217.nip.io'
Expand All @@ -20,21 +20,21 @@ global:
apm-portal:
image:
registry: *registry
repository: refar/apm-portal
repository: apm-portal
tag: "v5.7.1"
ingress:
hostName: *ingressHostName
className: *ingressClassName
apm-api:
image:
registry: *registry
repository: refar/apm-api
repository: apm-api
tag: "v5.7.1"
ingress:
hostName: *ingressHostName
className: *ingressClassName
apm-operator:
image:
registry: *registry
repository: refar/apm-operator-server
repository: apm-operator-server
tag: "v5.7.1"
4 changes: 3 additions & 1 deletion charts/tmf-component/charts/framework-operator/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ spec:
valueFrom:
secretKeyRef:
key: password
name: pkcs12-password-secret
name: pkcs12-password-secret
- name: HARBOR_URL
value: {{ .Values.image.registry }}
volumeMounts:
- mountPath: /etc/localtime
name: localtime
Expand Down
4 changes: 2 additions & 2 deletions charts/tmf-component/charts/framework-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
replicaCount: 1

image:
registry: 192.168.90.214
repository: system_containers/framework-operator-server
registry: 192.168.90.214/system_containers
repository: framework-operator-server
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "v5.6.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/tmf-component/charts/initializr/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
replicaCount: 1

image:
registry: 192.168.90.214
repository: system_containers/initializr-api
registry: 192.168.90.214/system_containers
repository: initializr-api
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "v5.3.0"
Expand Down
20 changes: 0 additions & 20 deletions charts/tmf-component/charts/msa-portal/templates/component.yaml
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions charts/tmf-component/charts/msa-portal/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@
replicaCount: 1

image:
registry: 192.168.90.214
repository: system_containers/msa-portal
registry: 192.168.90.214/system_containers
repository: msa-portal
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "v5.6.0"

cluster:
server: https://192.168.1.1

imagePullSecrets: []
nameOverride: "msa-portal"
appName: "springcloud"
Expand Down
4 changes: 2 additions & 2 deletions charts/tmf-component/charts/spring-cloud-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
replicaCount: 1

image:
registry: 192.168.90.214
repository: system_containers/spring-cloud-api
registry: 192.168.90.214/system_containers
repository: spring-cloud-api
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "v5.7.1"
Expand Down
20 changes: 12 additions & 8 deletions charts/tmf-component/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ global:
host: true

registry: &registry
docker.io

docker.io/refar
# Cluster server's url, it's the url of oidc proxy generally
clusterServer: &clusterServer
https://192.168.1.1
# Ingress host name
ingressHostName: &ingressHostName
'portal.192.168.90.219.nip.io'
Expand All @@ -18,9 +20,11 @@ global:

msa-portal:
enabled: true
cluster:
server: *clusterServer
image:
registry: *registry
repository: refar/msa-portal
repository: msa-portal
tag: "v5.7.1"
ingress:
hostName: *ingressHostName
Expand All @@ -29,7 +33,7 @@ spring-cloud-api:
enabled: true
image:
registry: *registry
repository: refar/spring-cloud-api
repository: spring-cloud-api
tag: "v5.7.1"
ingress:
hostName: *ingressHostName
Expand All @@ -38,7 +42,7 @@ initializr:
enabled: true
image:
registry: *registry
repository: refar/initializr-api
repository: initializr-api
tag: "v5.3.0"
ingress:
hostName: *ingressHostName
Expand All @@ -49,13 +53,13 @@ framework-operator:
clusterId: default-cluster
image:
registry: *registry
repository: refar/framework-operator-server
repository: framework-operator-server
tag: "v5.7.1"
certImage:
registry: *registry
repository: refar/operator-cert-tmf
repository: operator-cert-tmf
tag: "v5.7.1"
envInjectorImage:
registry: *registry
repository: refar/tmf-env-injector
repository: tmf-env-injector
tag: "latest"
Loading