Browse Source

update URLs

pull/1/head
Nicolas Massé 3 years ago
parent
commit
cf70fcbcbd
  1. 6
      charts/eshop/Chart.yaml
  2. 2
      charts/eshop/README.md
  3. 8
      charts/eshop/templates/eshop-api.yaml
  4. 8
      charts/eshop/templates/eshop-web.yaml
  5. 6
      charts/sql-server-2019/Chart.yaml
  6. 4
      infrastructure.yaml.sample
  7. 4
      infrastructure/templates/helmchartrepository.yaml

6
charts/eshop/Chart.yaml

@ -7,8 +7,8 @@ description: A Helm chart to deploy eShopOnWeb
keywords: keywords:
- dotnet - dotnet
sources: sources:
- https://github.com/nmasse-itix/eShopOnWeb-gitops - https://github.com/eShopOnWeb-OpenShift/gitops
home: https://github.com/nmasse-itix/eShopOnWeb home: https://github.com/eShopOnWeb-OpenShift
maintainers: maintainers:
- name: Nicolas Massé - name: Nicolas Massé
email: nmasse@redhat.com email: nmasse@redhat.com
@ -20,7 +20,7 @@ annotations:
charts.openshift.io/providerType: community charts.openshift.io/providerType: community
charts.openshift.io/supportedOpenShiftVersions: '>=4.13' charts.openshift.io/supportedOpenShiftVersions: '>=4.13'
charts.openshift.io/testedOpenShiftVersion: '4.13' charts.openshift.io/testedOpenShiftVersion: '4.13'
charts.openshift.io/supportURL: https://github.com/nmasse-itix/eShopOnWeb-gitops/issues charts.openshift.io/supportURL: https://github.com/eShopOnWeb-OpenShift/gitops/issues
charts.openshift.io/provider: Red Hat SSA France charts.openshift.io/provider: Red Hat SSA France
charts.openshift.io/archs: x86_64 charts.openshift.io/archs: x86_64
icon: https://raw.githubusercontent.com/dotnet-architecture/eShopOnWeb/main/src/Web/wwwroot/images/brand.png icon: https://raw.githubusercontent.com/dotnet-architecture/eShopOnWeb/main/src/Web/wwwroot/images/brand.png

2
charts/eshop/README.md

@ -1,6 +1,6 @@
# eShopOnWeb Helm Chart # eShopOnWeb Helm Chart
A Helm chart for deploying [eShopOnWeb](https://github.com/nmasse-itix/eShopOnWeb) on OpenShift. A Helm chart for deploying [eShopOnWeb](https://github.com/eShopOnWeb-OpenShift/eShopOnWeb) on OpenShift.
## Pre-requisites ## Pre-requisites

8
charts/eshop/templates/eshop-api.yaml

@ -2,7 +2,7 @@ apiVersion: image.openshift.io/v1
kind: ImageStream kind: ImageStream
metadata: metadata:
annotations: annotations:
app.openshift.io/vcs-uri: https://github.com/nmasse-itix/eShopOnWeb.git app.openshift.io/vcs-uri: https://github.com/eShopOnWeb-OpenShift/eShopOnWeb.git
labels: labels:
app: eshop app: eshop
app.kubernetes.io/component: eshop-api app.kubernetes.io/component: eshop-api
@ -21,7 +21,7 @@ kind: BuildConfig
metadata: metadata:
annotations: annotations:
app.openshift.io/connects-to: '[{"apiVersion":"apps/v1","kind":"Deployment","name":"sql-server"}]' app.openshift.io/connects-to: '[{"apiVersion":"apps/v1","kind":"Deployment","name":"sql-server"}]'
app.openshift.io/vcs-uri: https://github.com/nmasse-itix/eShopOnWeb.git app.openshift.io/vcs-uri: https://github.com/eShopOnWeb-OpenShift/eShopOnWeb.git
labels: labels:
app: eshop-api app: eshop-api
app.kubernetes.io/component: eshop-api app.kubernetes.io/component: eshop-api
@ -44,7 +44,7 @@ spec:
source: source:
contextDir: / contextDir: /
git: git:
uri: https://github.com/nmasse-itix/eShopOnWeb.git uri: https://github.com/eShopOnWeb-OpenShift/eShopOnWeb.git
type: Git type: Git
strategy: strategy:
sourceStrategy: sourceStrategy:
@ -69,7 +69,7 @@ metadata:
alpha.image.policy.openshift.io/resolve-names: '*' alpha.image.policy.openshift.io/resolve-names: '*'
app.openshift.io/connects-to: '[{"apiVersion":"apps/v1","kind":"Deployment","name":"sql-server"}]' app.openshift.io/connects-to: '[{"apiVersion":"apps/v1","kind":"Deployment","name":"sql-server"}]'
app.openshift.io/route-disabled: "false" app.openshift.io/route-disabled: "false"
app.openshift.io/vcs-uri: https://github.com/nmasse-itix/eShopOnWeb.git app.openshift.io/vcs-uri: https://github.com/eShopOnWeb-OpenShift/eShopOnWeb.git
image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"eshop-api:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"eshop-api\")].image","pause":"false"}]' image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"eshop-api:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"eshop-api\")].image","pause":"false"}]'
labels: labels:
app: eshop app: eshop

8
charts/eshop/templates/eshop-web.yaml

@ -2,7 +2,7 @@ apiVersion: image.openshift.io/v1
kind: ImageStream kind: ImageStream
metadata: metadata:
annotations: annotations:
app.openshift.io/vcs-uri: https://github.com/nmasse-itix/eShopOnWeb.git app.openshift.io/vcs-uri: https://github.com/eShopOnWeb-OpenShift/eShopOnWeb.git
labels: labels:
app: eshop app: eshop
app.kubernetes.io/component: eshop-web app.kubernetes.io/component: eshop-web
@ -21,7 +21,7 @@ kind: BuildConfig
metadata: metadata:
annotations: annotations:
app.openshift.io/connects-to: '[{"apiVersion":"apps/v1","kind":"Deployment","name":"sql-server"}]' app.openshift.io/connects-to: '[{"apiVersion":"apps/v1","kind":"Deployment","name":"sql-server"}]'
app.openshift.io/vcs-uri: https://github.com/nmasse-itix/eShopOnWeb.git app.openshift.io/vcs-uri: https://github.com/eShopOnWeb-OpenShift/eShopOnWeb.git
labels: labels:
app: eshop-web app: eshop-web
app.kubernetes.io/component: eshop-web app.kubernetes.io/component: eshop-web
@ -44,7 +44,7 @@ spec:
source: source:
contextDir: / contextDir: /
git: git:
uri: https://github.com/nmasse-itix/eShopOnWeb.git uri: https://github.com/eShopOnWeb-OpenShift/eShopOnWeb.git
type: Git type: Git
strategy: strategy:
sourceStrategy: sourceStrategy:
@ -69,7 +69,7 @@ metadata:
alpha.image.policy.openshift.io/resolve-names: '*' alpha.image.policy.openshift.io/resolve-names: '*'
app.openshift.io/connects-to: '[{"apiVersion":"apps/v1","kind":"Deployment","name":"sql-server"}]' app.openshift.io/connects-to: '[{"apiVersion":"apps/v1","kind":"Deployment","name":"sql-server"}]'
app.openshift.io/route-disabled: "false" app.openshift.io/route-disabled: "false"
app.openshift.io/vcs-uri: https://github.com/nmasse-itix/eShopOnWeb.git app.openshift.io/vcs-uri: https://github.com/eShopOnWeb-OpenShift/eShopOnWeb.git
image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"eshop-web:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"eshop-web\")].image","pause":"false"}]' image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"eshop-web:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"eshop-web\")].image","pause":"false"}]'
labels: labels:
app: eshop app: eshop

6
charts/sql-server-2019/Chart.yaml

@ -8,8 +8,8 @@ keywords:
- mssql - mssql
- database - database
sources: sources:
- https://github.com/nmasse-itix/eShopOnWeb-gitops - https://github.com/eShopOnWeb-OpenShift/gitops
home: https://github.com/nmasse-itix/eShopOnWeb-gitops home: https://github.com/eShopOnWeb-OpenShift
maintainers: maintainers:
- name: Nicolas Massé - name: Nicolas Massé
email: nmasse@redhat.com email: nmasse@redhat.com
@ -21,7 +21,7 @@ annotations:
charts.openshift.io/providerType: community charts.openshift.io/providerType: community
charts.openshift.io/supportedOpenShiftVersions: '>=4.13' charts.openshift.io/supportedOpenShiftVersions: '>=4.13'
charts.openshift.io/testedOpenShiftVersion: '4.13' charts.openshift.io/testedOpenShiftVersion: '4.13'
charts.openshift.io/supportURL: https://github.com/nmasse-itix/eShopOnWeb-gitops/issues charts.openshift.io/supportURL: https://github.com/eShopOnWeb-OpenShift/gitops/issues
charts.openshift.io/provider: Red Hat SSA France charts.openshift.io/provider: Red Hat SSA France
charts.openshift.io/archs: x86_64 charts.openshift.io/archs: x86_64
# Taken from https://github.com/elastic/eui/issues/1516 # Taken from https://github.com/elastic/eui/issues/1516

4
infrastructure.yaml.sample

@ -1,7 +1,7 @@
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: Application kind: Application
metadata: metadata:
name: eshop name: eshoponweb
namespace: openshift-gitops namespace: openshift-gitops
spec: spec:
destination: destination:
@ -9,7 +9,7 @@ spec:
server: 'https://kubernetes.default.svc' server: 'https://kubernetes.default.svc'
source: source:
path: infrastructure path: infrastructure
repoURL: 'https://github.com/nmasse-itix/eShopOnWeb-gitops.git' repoURL: 'https://github.com/eShopOnWeb-OpenShift/gitops.git'
targetRevision: main targetRevision: main
helm: helm:
parameters: parameters:

4
infrastructure/templates/helmchartrepository.yaml

@ -28,7 +28,7 @@ apiVersion: build.openshift.io/v1
metadata: metadata:
annotations: annotations:
argocd.argoproj.io/sync-wave: "20" argocd.argoproj.io/sync-wave: "20"
app.openshift.io/vcs-uri: 'https://github.com/nmasse-itix/eShopOnWeb-gitops.git' app.openshift.io/vcs-uri: 'https://github.com/eShopOnWeb-OpenShift/gitops.git'
name: helm-repository name: helm-repository
namespace: eshop-infra namespace: eshop-infra
labels: labels:
@ -53,7 +53,7 @@ spec:
source: source:
type: Git type: Git
git: git:
uri: 'https://github.com/nmasse-itix/eShopOnWeb-gitops.git' uri: 'https://github.com/eShopOnWeb-OpenShift/gitops.git'
contextDir: /charts contextDir: /charts
triggers: triggers:
- type: ConfigChange - type: ConfigChange

Loading…
Cancel
Save