Skip to content
New issue

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

#

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

Already on GitHub? # to your account

[HAMMER] Remove artemis from the templates #294

Merged
merged 1 commit into from
Jun 4, 2018
Merged

[HAMMER] Remove artemis from the templates #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
102 changes: 0 additions & 102 deletions templates/miq-template-ext-db.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ objects:
admin-password: "${APPLICATION_ADMIN_PASSWORD}"
database-url: postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_SERVICE_NAME}/${DATABASE_NAME}?encoding=utf8&pool=5&wait_timeout=5
v2-key: "${V2_KEY}"
artemis-password: "${ARTEMIS_PASSWORD}"
- apiVersion: v1
kind: Service
metadata:
Expand Down Expand Up @@ -126,13 +125,6 @@ objects:
secretKeyRef:
name: "${NAME}-secrets"
key: admin-password
- name: ARTEMIS_PASSWORD
valueFrom:
secretKeyRef:
name: "${NAME}-secrets"
key: artemis-password
- name: ARTEMIS_USER
value: "${ARTEMIS_USER}"
- name: DATABASE_REGION
value: "${DATABASE_REGION}"
- name: DATABASE_URL
Expand Down Expand Up @@ -226,13 +218,6 @@ objects:
secretKeyRef:
name: "${NAME}-secrets"
key: v2-key
- name: ARTEMIS_USER
value: "${ARTEMIS_USER}"
- name: ARTEMIS_PASSWORD
valueFrom:
secretKeyRef:
name: "${NAME}-secrets"
key: artemis-password
resources:
requests:
memory: "${APPLICATION_MEM_REQ}"
Expand Down Expand Up @@ -631,74 +616,6 @@ objects:
- "/usr/bin/save-container-environment"
serviceAccount: miq-httpd
serviceAccountName: miq-httpd
- apiVersion: v1
kind: Service
metadata:
name: artemis
annotations:
description: Exposes the the artemis broker service
spec:
ports:
- name: stomp
port: 61613
targetPort: 61613
selector:
name: artemis
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: artemis
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 1Gi
- apiVersion: v1
kind: DeploymentConfig
metadata:
name: artemis
annotations:
description: Defines how to deploy the artemis server
spec:
strategy:
type: Recreate
triggers:
- type: ConfigChange
replicas: 1
selector:
name: artemis
template:
metadata:
name: artemis
labels:
name: artemis
spec:
volumes:
- name: artemis-volume
persistentVolumeClaim:
claimName: artemis
containers:
- name: artemis
image: "${ARTEMIS_IMG_NAME}:${ARTEMIS_IMG_TAG}"
ports:
- containerPort: 61613
readinessProbe:
timeoutSeconds: 1
initialDelaySeconds: 10
tcpSocket:
port: 61613
volumeMounts:
- name: artemis-volume
mountPath: "/var/lib/artemis"
env:
- name: ARTEMIS_USER
value: "${ARTEMIS_USER}"
- name: ARTEMIS_PASSWORD
valueFrom:
secretKeyRef:
name: "${NAME}-secrets"
key: artemis-password
parameters:
- name: NAME
displayName: Name
Expand Down Expand Up @@ -752,17 +669,6 @@ parameters:
required: true
description: Admin password that will be set on the application.
value: smartvm
- name: ARTEMIS_USER
displayName: Artemis broker username
required: true
description: Username for the artemis broker server.
value: artemis
- name: ARTEMIS_PASSWORD
displayName: Artemis broker password
required: true
description: Password for the artemis broker server.
from: "[a-zA-Z0-9]{8}"
generate: expression
- name: MEMCACHED_SERVICE_NAME
required: true
displayName: Memcached Service Name
Expand Down Expand Up @@ -830,14 +736,6 @@ parameters:
displayName: Back end Application Image Tag
description: This is the ManageIQ Backend Application image tag/version requested to deploy.
value: backend-latest-hammer
- name: ARTEMIS_IMG_NAME
displayName: Artemis Image Name
description: This is the Artemis image name requested to deploy.
value: docker.io/carbonin/artemis
- name: ARTEMIS_IMG_TAG
displayName: Artemis Image Tag
description: This is the Artemis image tag/version requested to deploy.
value: latest
- name: APPLICATION_DOMAIN
displayName: Application Hostname
description: The exposed hostname that will route to the application service, if left blank a value will be defaulted.
Expand Down
102 changes: 0 additions & 102 deletions templates/miq-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ objects:
admin-password: "${APPLICATION_ADMIN_PASSWORD}"
database-url: postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_SERVICE_NAME}/${DATABASE_NAME}?encoding=utf8&pool=5&wait_timeout=5
v2-key: "${V2_KEY}"
artemis-password: "${ARTEMIS_PASSWORD}"
- apiVersion: v1
kind: ConfigMap
metadata:
Expand Down Expand Up @@ -394,13 +393,6 @@ objects:
secretKeyRef:
name: "${NAME}-secrets"
key: admin-password
- name: ARTEMIS_PASSWORD
valueFrom:
secretKeyRef:
name: "${NAME}-secrets"
key: artemis-password
- name: ARTEMIS_USER
value: "${ARTEMIS_USER}"
- name: DATABASE_REGION
value: "${DATABASE_REGION}"
- name: DATABASE_URL
Expand Down Expand Up @@ -494,13 +486,6 @@ objects:
secretKeyRef:
name: "${NAME}-secrets"
key: v2-key
- name: ARTEMIS_USER
value: "${ARTEMIS_USER}"
- name: ARTEMIS_PASSWORD
valueFrom:
secretKeyRef:
name: "${NAME}-secrets"
key: artemis-password
resources:
requests:
memory: "${APPLICATION_MEM_REQ}"
Expand Down Expand Up @@ -776,74 +761,6 @@ objects:
- "/usr/bin/save-container-environment"
serviceAccount: miq-httpd
serviceAccountName: miq-httpd
- apiVersion: v1
kind: Service
metadata:
name: artemis
annotations:
description: Exposes the the artemis broker service
spec:
ports:
- name: stomp
port: 61613
targetPort: 61613
selector:
name: artemis
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: artemis
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 1Gi
- apiVersion: v1
kind: DeploymentConfig
metadata:
name: artemis
annotations:
description: Defines how to deploy the artemis server
spec:
strategy:
type: Recreate
triggers:
- type: ConfigChange
replicas: 1
selector:
name: artemis
template:
metadata:
name: artemis
labels:
name: artemis
spec:
volumes:
- name: artemis-volume
persistentVolumeClaim:
claimName: artemis
containers:
- name: artemis
image: "${ARTEMIS_IMG_NAME}:${ARTEMIS_IMG_TAG}"
ports:
- containerPort: 61613
readinessProbe:
timeoutSeconds: 1
initialDelaySeconds: 10
tcpSocket:
port: 61613
volumeMounts:
- name: artemis-volume
mountPath: "/var/lib/artemis"
env:
- name: ARTEMIS_USER
value: "${ARTEMIS_USER}"
- name: ARTEMIS_PASSWORD
valueFrom:
secretKeyRef:
name: "${NAME}-secrets"
key: artemis-password
parameters:
- name: NAME
displayName: Name
Expand Down Expand Up @@ -887,17 +804,6 @@ parameters:
required: true
description: Admin password that will be set on the application.
value: smartvm
- name: ARTEMIS_USER
displayName: Artemis broker username
required: true
description: Username for the artemis broker server.
value: artemis
- name: ARTEMIS_PASSWORD
displayName: Artemis broker password
required: true
description: Password for the artemis broker server.
from: "[a-zA-Z0-9]{8}"
generate: expression
- name: MEMCACHED_SERVICE_NAME
required: true
displayName: Memcached Service Name
Expand Down Expand Up @@ -996,14 +902,6 @@ parameters:
displayName: Back end Application Image Tag
description: This is the ManageIQ Backend Application image tag/version requested to deploy.
value: backend-latest-hammer
- name: ARTEMIS_IMG_NAME
displayName: Artemis Image Name
description: This is the Artemis image name requested to deploy.
value: docker.io/carbonin/artemis
- name: ARTEMIS_IMG_TAG
displayName: Artemis Image Tag
description: This is the Artemis image tag/version requested to deploy.
value: latest
- name: APPLICATION_DOMAIN
displayName: Application Hostname
description: The exposed hostname that will route to the application service, if left blank a value will be defaulted.
Expand Down