diff --git a/charts/sno-helm-charts/templates/amq-broker-broker.yaml b/charts/sno-helm-charts/templates/amq-broker-broker.yaml deleted file mode 100644 index 8863851..0000000 --- a/charts/sno-helm-charts/templates/amq-broker-broker.yaml +++ /dev/null @@ -1,45 +0,0 @@ -kind: Namespace -apiVersion: v1 -metadata: - name: {{ .Values.amqbroker.namespace }} ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: amq-broker - namespace: {{ .Values.amqbroker.namespace }} -spec: - channel: current - installPlanApproval: Automatic - name: amq-broker - source: redhat-operators - sourceNamespace: openshift-marketplace - startingCSV: {{ .Values.amqbroker.startingCSV }} ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: {{ .Values.amqbroker.namespace }} - namespace: {{ .Values.amqbroker.namespace }} -spec: - targetNamespaces: - - {{ .Values.amqbroker.namespace }} ---- -apiVersion: broker.amq.io/v2alpha4 -kind: ActiveMQArtemis -metadata: - name: {{ .Values.amqbroker.brokerName }} - application: {{ .Values.amqbroker.brokerName }} - namespace: {{ .Values.amqbroker.namespace }} -spec: - adminPassword: {{ .Values.amqbroker.adminPassword }} - deploymentPlan: - size: {{ .Values.amqbroker.size }} - persistenceEnabled: false - requireLogin: false - messageMigration: false - managementRBACEnabled: true - journalType: nio - jolokiaAgentEnabled: false - image: placeholder - adminUser: {{ .Values.amqbroker.adminUser }} \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/amq-broker-ns.yaml b/charts/sno-helm-charts/templates/amq-broker-ns.yaml deleted file mode 100644 index 2bb0290..0000000 --- a/charts/sno-helm-charts/templates/amq-broker-ns.yaml +++ /dev/null @@ -1,4 +0,0 @@ -kind: Namespace -apiVersion: v1 -metadata: - name: {{ .Values.amqbroker.namespace }} \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/amq-broker-operatorgroup.yaml b/charts/sno-helm-charts/templates/amq-broker-operatorgroup.yaml deleted file mode 100644 index 99fbc44..0000000 --- a/charts/sno-helm-charts/templates/amq-broker-operatorgroup.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: {{ .Values.amqbroker.namespace }} - namespace: {{ .Values.amqbroker.namespace }} -spec: - targetNamespaces: - - {{ .Values.amqbroker.namespace }} \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/gitops-appproject.yaml b/charts/sno-helm-charts/templates/gitops-appproject.yaml deleted file mode 100644 index f49a56f..0000000 --- a/charts/sno-helm-charts/templates/gitops-appproject.yaml +++ /dev/null @@ -1,160 +0,0 @@ -kind: Namespace -apiVersion: v1 -metadata: - name: openshift-gitops - labels: - project: openshift-gitops ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: openshift-gitops-operator - namespace: openshift-operators -spec: - channel: stable - installPlanApproval: Automatic - name: openshift-gitops-operator - source: redhat-operators - sourceNamespace: openshift-marketplace - startingCSV: {{ .Values.gitops.startingCSV }} ---- -{{ if .Values.gitops.clusterAdminController }} -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: argocd-application-controller-cluster-admin -subjects: - - kind: ServiceAccount - name: argocd-application-controller - namespace: openshift-gitops -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin -{{ end }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: cluster-config - namespace: openshift-gitops -spec: - clusterResourceWhitelist: - - group: '*' - kind: '*' - destinations: - - namespace: '*' - server: '*' - sourceRepos: - - '*' ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - server: - autoscale: - enabled: false - grpc: - ingress: - enabled: false - ingress: - enabled: false - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 125m - memory: 128Mi - route: - enabled: true - service: - type: '' - grafana: - enabled: false - ingress: - enabled: false - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - route: - enabled: false - prometheus: - enabled: false - ingress: - enabled: false - route: - enabled: false - initialSSHKnownHosts: {} - applicationSet: - resources: - limits: - cpu: '2' - memory: 1Gi - requests: - cpu: 250m - memory: 512Mi - rbac: {} - repo: - resources: - limits: - cpu: '1' - memory: 1Gi - requests: - cpu: 250m - memory: 256Mi - resourceExclusions: | - - apiGroups: - - tekton.dev - clusters: - - '*' - kinds: - - TaskRun - - PipelineRun - dex: - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - ha: - enabled: false - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - tls: - ca: {} - redis: - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - controller: - processors: {} - resources: - limits: - cpu: '1' - memory: 2Gi - requests: - cpu: 250m - memory: 1Gi - initialRepositories: | - - name: cluster-config - type: git - url: {{ .Values.gitops.initialRepository }} \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/gitops-argocd.yaml b/charts/sno-helm-charts/templates/gitops-argocd.yaml deleted file mode 100644 index f49a56f..0000000 --- a/charts/sno-helm-charts/templates/gitops-argocd.yaml +++ /dev/null @@ -1,160 +0,0 @@ -kind: Namespace -apiVersion: v1 -metadata: - name: openshift-gitops - labels: - project: openshift-gitops ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: openshift-gitops-operator - namespace: openshift-operators -spec: - channel: stable - installPlanApproval: Automatic - name: openshift-gitops-operator - source: redhat-operators - sourceNamespace: openshift-marketplace - startingCSV: {{ .Values.gitops.startingCSV }} ---- -{{ if .Values.gitops.clusterAdminController }} -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: argocd-application-controller-cluster-admin -subjects: - - kind: ServiceAccount - name: argocd-application-controller - namespace: openshift-gitops -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin -{{ end }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: cluster-config - namespace: openshift-gitops -spec: - clusterResourceWhitelist: - - group: '*' - kind: '*' - destinations: - - namespace: '*' - server: '*' - sourceRepos: - - '*' ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - server: - autoscale: - enabled: false - grpc: - ingress: - enabled: false - ingress: - enabled: false - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 125m - memory: 128Mi - route: - enabled: true - service: - type: '' - grafana: - enabled: false - ingress: - enabled: false - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - route: - enabled: false - prometheus: - enabled: false - ingress: - enabled: false - route: - enabled: false - initialSSHKnownHosts: {} - applicationSet: - resources: - limits: - cpu: '2' - memory: 1Gi - requests: - cpu: 250m - memory: 512Mi - rbac: {} - repo: - resources: - limits: - cpu: '1' - memory: 1Gi - requests: - cpu: 250m - memory: 256Mi - resourceExclusions: | - - apiGroups: - - tekton.dev - clusters: - - '*' - kinds: - - TaskRun - - PipelineRun - dex: - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - ha: - enabled: false - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - tls: - ca: {} - redis: - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - controller: - processors: {} - resources: - limits: - cpu: '1' - memory: 2Gi - requests: - cpu: 250m - memory: 1Gi - initialRepositories: | - - name: cluster-config - type: git - url: {{ .Values.gitops.initialRepository }} \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/gitops-crb.yaml b/charts/sno-helm-charts/templates/gitops-crb.yaml deleted file mode 100644 index 05d92ec..0000000 --- a/charts/sno-helm-charts/templates/gitops-crb.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{ if .Values.gitops.clusterAdminController }} -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: argocd-application-controller-cluster-admin -subjects: - - kind: ServiceAccount - name: argocd-application-controller - namespace: openshift-gitops -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin -{{ end }} \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/gitops-ns.yaml b/charts/sno-helm-charts/templates/gitops-ns.yaml deleted file mode 100644 index daa5fde..0000000 --- a/charts/sno-helm-charts/templates/gitops-ns.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: Namespace -apiVersion: v1 -metadata: - name: openshift-gitops - labels: - project: openshift-gitops \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/mongo-ns.yaml b/charts/sno-helm-charts/templates/mongo-ns.yaml deleted file mode 100644 index 6eb63bd..0000000 --- a/charts/sno-helm-charts/templates/mongo-ns.yaml +++ /dev/null @@ -1,4 +0,0 @@ -kind: Namespace -apiVersion: v1 -metadata: - name: {{ .Values.mongo.namespace }} \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/mongo-sa.yaml b/charts/sno-helm-charts/templates/mongo-sa.yaml deleted file mode 100644 index 901490d..0000000 --- a/charts/sno-helm-charts/templates/mongo-sa.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ServiceAccount -apiVersion: v1 -metadata: - name: mongodb - namespace: {{ .Values.mongo.namespace }} \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/postgresql-ns.yaml b/charts/sno-helm-charts/templates/postgresql-ns.yaml deleted file mode 100644 index a147d1e..0000000 --- a/charts/sno-helm-charts/templates/postgresql-ns.yaml +++ /dev/null @@ -1,4 +0,0 @@ -kind: Namespace -apiVersion: v1 -metadata: - name: {{ .Values.postgresql.namespace }} \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/postgresql-sa.yaml b/charts/sno-helm-charts/templates/postgresql-sa.yaml deleted file mode 100644 index ee66406..0000000 --- a/charts/sno-helm-charts/templates/postgresql-sa.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ServiceAccount -apiVersion: v1 -metadata: - name: postgresql - namespace: {{ .Values.postgresql.namespace }} \ No newline at end of file diff --git a/charts/sno-helm-charts/Chart.yaml b/charts/sno-install/Chart.yaml similarity index 62% rename from charts/sno-helm-charts/Chart.yaml rename to charts/sno-install/Chart.yaml index 5f5b47a..c6ab025 100644 --- a/charts/sno-helm-charts/Chart.yaml +++ b/charts/sno-install/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -name: sno-helm-charts +name: manufacturing-comp-factory-sno-install description: Helm chart to deploy factory components to SNO type: application version: 0.0.1 -appVersion: "1.0.0" +appVersion: "1.0.0" \ No newline at end of file diff --git a/charts/sno-install/templates/amq-broker-broker.yaml b/charts/sno-install/templates/amq-broker-broker.yaml new file mode 100644 index 0000000..a647e54 --- /dev/null +++ b/charts/sno-install/templates/amq-broker-broker.yaml @@ -0,0 +1,17 @@ +apiVersion: broker.amq.io/v2alpha4 +kind: ActiveMQArtemis +metadata: + name: {{ .Values.amqbroker.brokerName }} + application: {{ .Values.amqbroker.brokerName }} +spec: + adminPassword: {{ .Values.amqbroker.adminPassword }} + deploymentPlan: + size: {{ .Values.amqbroker.size }} + persistenceEnabled: false + requireLogin: false + messageMigration: false + managementRBACEnabled: true + journalType: nio + jolokiaAgentEnabled: false + image: placeholder + adminUser: {{ .Values.amqbroker.adminUser }} \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/mongo-deployment.yaml b/charts/sno-install/templates/mongo-deployment.yaml similarity index 97% rename from charts/sno-helm-charts/templates/mongo-deployment.yaml rename to charts/sno-install/templates/mongo-deployment.yaml index 5d80a0c..e6cb411 100644 --- a/charts/sno-helm-charts/templates/mongo-deployment.yaml +++ b/charts/sno-install/templates/mongo-deployment.yaml @@ -2,7 +2,6 @@ kind: Deployment apiVersion: apps/v1 metadata: name: mongodb - namespace: {{ .Values.mongo.namespace }} labels: app: mongodb spec: diff --git a/charts/sno-helm-charts/templates/mongo-pv.yaml b/charts/sno-install/templates/mongo-pv.yaml similarity index 100% rename from charts/sno-helm-charts/templates/mongo-pv.yaml rename to charts/sno-install/templates/mongo-pv.yaml diff --git a/charts/sno-helm-charts/templates/mongo-pvc.yaml b/charts/sno-install/templates/mongo-pvc.yaml similarity index 83% rename from charts/sno-helm-charts/templates/mongo-pvc.yaml rename to charts/sno-install/templates/mongo-pvc.yaml index b4d0de0..853c18b 100644 --- a/charts/sno-helm-charts/templates/mongo-pvc.yaml +++ b/charts/sno-install/templates/mongo-pvc.yaml @@ -2,7 +2,6 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: mongodb-pvc - namespace: {{ .Values.mongo.namespace }} spec: accessModes: - ReadWriteOnce diff --git a/charts/sno-helm-charts/templates/mongo-rb.yaml b/charts/sno-install/templates/mongo-rb.yaml similarity index 63% rename from charts/sno-helm-charts/templates/mongo-rb.yaml rename to charts/sno-install/templates/mongo-rb.yaml index 1e52de5..8b4809a 100644 --- a/charts/sno-helm-charts/templates/mongo-rb.yaml +++ b/charts/sno-install/templates/mongo-rb.yaml @@ -1,12 +1,11 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: 'system:openshift:scc:privileged' - namespace: {{ .Values.mongo.namespace }} + name: mongo-privileged subjects: - kind: ServiceAccount name: mongodb - namespace: {{ .Values.mongo.namespace }} + namespace: {{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/sno-install/templates/mongo-sa.yaml b/charts/sno-install/templates/mongo-sa.yaml new file mode 100644 index 0000000..6bfec74 --- /dev/null +++ b/charts/sno-install/templates/mongo-sa.yaml @@ -0,0 +1,4 @@ +kind: ServiceAccount +apiVersion: v1 +metadata: + name: mongodb \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/mongo-secret.yaml b/charts/sno-install/templates/mongo-secret.yaml similarity index 87% rename from charts/sno-helm-charts/templates/mongo-secret.yaml rename to charts/sno-install/templates/mongo-secret.yaml index 1814134..6b42b58 100644 --- a/charts/sno-helm-charts/templates/mongo-secret.yaml +++ b/charts/sno-install/templates/mongo-secret.yaml @@ -2,7 +2,6 @@ kind: Secret apiVersion: v1 metadata: name: mongodb - namespace: {{ .Values.mongo.namespace }} stringData: MONGODB_ADMIN_PASSWORD: {{ .Values.mongo.MONGODB_ADMIN_PASSWORD }} MONGODB_DATABASE: {{ .Values.mongo.MONGODB_DATABASE }} diff --git a/charts/sno-helm-charts/templates/mongo-service.yaml b/charts/sno-install/templates/mongo-service.yaml similarity index 87% rename from charts/sno-helm-charts/templates/mongo-service.yaml rename to charts/sno-install/templates/mongo-service.yaml index 4fcd414..fcdc7f3 100644 --- a/charts/sno-helm-charts/templates/mongo-service.yaml +++ b/charts/sno-install/templates/mongo-service.yaml @@ -2,7 +2,6 @@ kind: Service apiVersion: v1 metadata: name: mongodb - namespace: {{ .Values.mongo.namespace }} spec: ports: - name: 27017-tcp diff --git a/charts/sno-helm-charts/templates/postgresql-deployment.yaml b/charts/sno-install/templates/postgresql-deployment.yaml similarity index 81% rename from charts/sno-helm-charts/templates/postgresql-deployment.yaml rename to charts/sno-install/templates/postgresql-deployment.yaml index f432a45..0518eca 100644 --- a/charts/sno-helm-charts/templates/postgresql-deployment.yaml +++ b/charts/sno-install/templates/postgresql-deployment.yaml @@ -2,16 +2,8 @@ kind: Deployment apiVersion: apps/v1 metadata: name: postgresql - namespace: {{ .Values.postgresql.namespace }} labels: app: postgresql - app.kubernetes.io/component: postgresql - app.kubernetes.io/instance: postgresql - app.kubernetes.io/name: postgresql - app.kubernetes.io/part-of: postgresql - app.openshift.io/runtime: postgresql - app.openshift.io/runtime-namespace: openshift - app.openshift.io/runtime-version: '12' spec: replicas: 1 selector: diff --git a/charts/sno-helm-charts/templates/postgresql-pv.yaml b/charts/sno-install/templates/postgresql-pv.yaml similarity index 100% rename from charts/sno-helm-charts/templates/postgresql-pv.yaml rename to charts/sno-install/templates/postgresql-pv.yaml diff --git a/charts/sno-helm-charts/templates/postgresql-pvc.yaml b/charts/sno-install/templates/postgresql-pvc.yaml similarity index 82% rename from charts/sno-helm-charts/templates/postgresql-pvc.yaml rename to charts/sno-install/templates/postgresql-pvc.yaml index 6038158..78ec7c9 100644 --- a/charts/sno-helm-charts/templates/postgresql-pvc.yaml +++ b/charts/sno-install/templates/postgresql-pvc.yaml @@ -2,7 +2,6 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: postgresql-pvc - namespace: {{ .Values.postgresql.namespace }} spec: accessModes: - ReadWriteOnce diff --git a/charts/sno-helm-charts/templates/postgresql-rb.yaml b/charts/sno-install/templates/postgresql-rb.yaml similarity index 62% rename from charts/sno-helm-charts/templates/postgresql-rb.yaml rename to charts/sno-install/templates/postgresql-rb.yaml index 1409d48..9ebf5c9 100644 --- a/charts/sno-helm-charts/templates/postgresql-rb.yaml +++ b/charts/sno-install/templates/postgresql-rb.yaml @@ -1,12 +1,11 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: 'system:openshift:scc:privileged' - namespace: {{ .Values.postgresql.namespace }} + name: postgresql-privileged subjects: - kind: ServiceAccount name: postgresql - namespace: {{ .Values.postgresql.namespace }} + namespace: {{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/sno-install/templates/postgresql-sa.yaml b/charts/sno-install/templates/postgresql-sa.yaml new file mode 100644 index 0000000..2d1ee3e --- /dev/null +++ b/charts/sno-install/templates/postgresql-sa.yaml @@ -0,0 +1,4 @@ +kind: ServiceAccount +apiVersion: v1 +metadata: + name: postgresql \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/postgresql-secret.yaml b/charts/sno-install/templates/postgresql-secret.yaml similarity index 85% rename from charts/sno-helm-charts/templates/postgresql-secret.yaml rename to charts/sno-install/templates/postgresql-secret.yaml index fc9b125..20f5988 100644 --- a/charts/sno-helm-charts/templates/postgresql-secret.yaml +++ b/charts/sno-install/templates/postgresql-secret.yaml @@ -2,7 +2,6 @@ kind: Secret apiVersion: v1 metadata: name: postgresql - namespace: {{ .Values.postgresql.namespace }} stringData: POSTGRESQL_DATABASE: {{ .Values.postgresql.POSTGRESQL_DATABASE }} POSTGRESQL_PASSWORD: {{ .Values.postgresql.POSTGRESQL_PASSWORD }} diff --git a/charts/sno-helm-charts/templates/postgresql-service.yaml b/charts/sno-install/templates/postgresql-service.yaml similarity index 85% rename from charts/sno-helm-charts/templates/postgresql-service.yaml rename to charts/sno-install/templates/postgresql-service.yaml index e5b851c..a186c68 100644 --- a/charts/sno-helm-charts/templates/postgresql-service.yaml +++ b/charts/sno-install/templates/postgresql-service.yaml @@ -2,7 +2,6 @@ kind: Service apiVersion: v1 metadata: name: postgresql - namespace: {{ .Values.postgresql.namespace }} spec: ports: - name: postgresql diff --git a/charts/sno-helm-charts/values.yaml b/charts/sno-install/values.yaml similarity index 56% rename from charts/sno-helm-charts/values.yaml rename to charts/sno-install/values.yaml index d3cb8cc..5f9faab 100644 --- a/charts/sno-helm-charts/values.yaml +++ b/charts/sno-install/values.yaml @@ -1,16 +1,10 @@ -name: sno-helm-charts +name: manufacturing-comp-factory-sno-install amqbroker: - namespace: factory-amq-broker - startingCSV: amq-broker-operator.v7.8.1-opr-3 + size: 1 brokerName: factory01-broker adminPassword: qiotmanufacturingpassword adminUser: qiotmanufacturing -gitops: - clusterAdminController: true - startingCSV: openshift-gitops-operator.v1.2.1 - initialRepository: https://github.com/qiot-project/qiot-manufacturing-factory-gitops.git mongo: - namespace: "factory-mongo" path: "/mnt/hpvolumes/mongodb" storageCapacity: 5Gi MONGODB_ADMIN_PASSWORD: qiotmanufacturingmongoadminpass @@ -18,8 +12,7 @@ mongo: MONGODB_PASSWORD: mongopass MONGODB_USER: mongouser postgresql: - namespace: factory-postgresql - path: "/mnt/hpvolumes/mongodb" + path: "/mnt/hpvolumes/postgresql" storageCapacity: 5Gi POSTGRESQL_DATABASE: qiot_manufacturing POSTGRESQL_PASSWORD: qiotmanufacturingpassword diff --git a/charts/sno-pre-install/Chart.yaml b/charts/sno-pre-install/Chart.yaml new file mode 100644 index 0000000..1c03aed --- /dev/null +++ b/charts/sno-pre-install/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: manufacturing-comp-factory-sno-pre-install +description: Helm chart to deploy factory components to SNO +type: application +version: 0.0.1 +appVersion: "1.0.0" \ No newline at end of file diff --git a/charts/sno-pre-install/templates/amq-broker-operatorgroup.yaml b/charts/sno-pre-install/templates/amq-broker-operatorgroup.yaml new file mode 100644 index 0000000..30aaeff --- /dev/null +++ b/charts/sno-pre-install/templates/amq-broker-operatorgroup.yaml @@ -0,0 +1,7 @@ +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: {{ .Release.Namespace }} +spec: + targetNamespaces: + - {{ .Release.Namespace }} \ No newline at end of file diff --git a/charts/sno-helm-charts/templates/amq-broker-subscription.yaml b/charts/sno-pre-install/templates/amq-broker-subscription.yaml similarity index 85% rename from charts/sno-helm-charts/templates/amq-broker-subscription.yaml rename to charts/sno-pre-install/templates/amq-broker-subscription.yaml index b7ea04a..fa21b79 100644 --- a/charts/sno-helm-charts/templates/amq-broker-subscription.yaml +++ b/charts/sno-pre-install/templates/amq-broker-subscription.yaml @@ -2,7 +2,6 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: name: amq-broker - namespace: {{ .Values.amqbroker.namespace }} spec: channel: current installPlanApproval: Automatic diff --git a/charts/sno-helm-charts/templates/gitops-subscription.yaml b/charts/sno-pre-install/templates/gitops-subscription.yaml similarity index 100% rename from charts/sno-helm-charts/templates/gitops-subscription.yaml rename to charts/sno-pre-install/templates/gitops-subscription.yaml diff --git a/charts/sno-helm-charts/templates/hostpath.yaml b/charts/sno-pre-install/templates/hostpath.yaml similarity index 100% rename from charts/sno-helm-charts/templates/hostpath.yaml rename to charts/sno-pre-install/templates/hostpath.yaml diff --git a/charts/sno-pre-install/values.yaml b/charts/sno-pre-install/values.yaml new file mode 100644 index 0000000..ac15b85 --- /dev/null +++ b/charts/sno-pre-install/values.yaml @@ -0,0 +1,11 @@ +name: manufacturing-comp-factory-sno-pre-install +amqbroker: + startingCSV: amq-broker-operator.v7.8.1-opr-3 +gitops: + startingCSV: openshift-gitops-operator.v1.2.1 +mongo: + path: "/mnt/hpvolumes/mongodb" + storageCapacity: 5Gi +postgresql: + path: "/mnt/hpvolumes/postgresql" + storageCapacity: 5Gi \ No newline at end of file