Skip to content

Commit

Permalink
mpplus - changed url where igloo dashboard send user info updates to (#…
Browse files Browse the repository at this point in the history
…144)

* updated server url to new mp+

* mpplus update

* removed commented line

* removed commented line

* added mppus configs & updated to correct server url (with the ctx)

* removed mpplus backup cfg

* removed cfg values
  • Loading branch information
matallen authored Mar 17, 2022
1 parent f588448 commit 57008c0
Show file tree
Hide file tree
Showing 15 changed files with 481 additions and 4 deletions.
58 changes: 58 additions & 0 deletions mpplus/graphs-ext/DeploymentConfig-ninja-graphs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
kind: DeploymentConfig
apiVersion: apps.openshift.io/v1
metadata:
name: ninja-graphs
namespace: giveback--graphs-ext
labels:
app.kubernetes.io/part-of: giveback
spec:
strategy:
type: Rolling
rollingParams:
updatePeriodSeconds: 1
intervalSeconds: 1
timeoutSeconds: 600
maxUnavailable: 25%
maxSurge: 25%
resources: {}
activeDeadlineSeconds: 21600
triggers:
- type: ConfigChange
replicas: 1
revisionHistoryLimit: 10
test: false
selector:
app: ninja-graphs
template:
metadata:
creationTimestamp: null
labels:
app: ninja-graphs
spec:
volumes:
- name: giveback-graphs-storage
persistentVolumeClaim:
claimName: giveback-graphs-storage
containers:
- resources: {}
terminationMessagePath: /dev/termination-log
name: ninja-graphs
ports:
- containerPort: 8080
protocol: TCP
- containerPort: 8443
protocol: TCP
- containerPort: 8778
protocol: TCP
imagePullPolicy: Always
volumeMounts:
- name: giveback-graphs-storage
mountPath: /home/jboss
subPath: target/ninja-persistence
terminationMessagePolicy: File
image: 'images.paas.redhat.com/giveback/ninja-graphs:latest'
restartPolicy: Always
terminationGracePeriodSeconds: 30
dnsPolicy: ClusterFirst
securityContext: {}
schedulerName: default-scheduler
17 changes: 17 additions & 0 deletions mpplus/graphs-ext/PersistentVolumeClaim-ninja-graphs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: giveback-graphs-storage
namespace: giveback--graphs-ext
labels:
paas.redhat.com/appcode: GVBK-001
annotations:
kubernetes.io/reclaimPolicy: Delete
spec:
accessModes:
- ReadWriteMany
volumeMode: Filesystem
resources:
requests:
storage: 1Gi
storageClassName: aws-efs-tier-c3
26 changes: 26 additions & 0 deletions mpplus/graphs-ext/Routes-ninja-graphs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
kind: Route
apiVersion: route.openshift.io/v1
metadata:
name: ninja-graphs
namespace: giveback--graphs-ext
labels:
app: ninja-graphs
app.kubernetes.io/component: ninja-graphs
app.kubernetes.io/instance: ninja-graphs
app.kubernetes.io/name: java
app.kubernetes.io/part-of: giveback
app.openshift.io/runtime: java
app.openshift.io/runtime-version: openjdk-11-el7
shard: ext-waf
spec:
host: ninja-graphs-giveback--graphs-ext.apps.ext-waf.spoke.prod.us-east-1.aws.paas.redhat.com
to:
kind: Service
name: ninja-graphs
weight: 100
port:
targetPort: 8080-tcp
tls:
termination: edge
insecureEdgeTerminationPolicy: Allow
wildcardPolicy: None
41 changes: 41 additions & 0 deletions mpplus/graphs-ext/Service-ninja-graphs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
kind: Service
apiVersion: v1
metadata:
name: ninja-graphs
namespace: giveback--graphs-ext
labels:
app: ninja-graphs
app.kubernetes.io/component: ninja-graphs
app.kubernetes.io/instance: ninja-graphs
app.kubernetes.io/name: java
app.kubernetes.io/part-of: giveback
app.openshift.io/runtime: java
app.openshift.io/runtime-version: openjdk-11-el7
annotations:
app.openshift.io/vcs-ref: master
app.openshift.io/vcs-uri: >-
https://github.com/matallen/ninja-graphs
spec:
ports:
- name: 8080-tcp
protocol: TCP
port: 8080
targetPort: 8080
- name: 8443-tcp
protocol: TCP
port: 8443
targetPort: 8443
- name: 8778-tcp
protocol: TCP
port: 8778
targetPort: 8778
selector:
app: ninja-graphs
deploymentconfig: ninja-graphs
type: ClusterIP
sessionAffinity: None
ipFamilies:
- IPv4
ipFamilyPolicy: SingleStack
status:
loadBalancer: {}
34 changes: 34 additions & 0 deletions mpplus/preprod--build/BuildConfig-graphs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
kind: BuildConfig
apiVersion: build.openshift.io/v1
metadata:
name: ninja-graphs
namespace: giveback--build
spec:
nodeSelector: null
output:
to:
kind: DockerImage
name: 'images.paas.redhat.com/giveback/ninja-graphs:latest'
pushSecret:
name: images-paas-push-config
postCommit: {}
resources: {}
runPolicy: Serial
successfulBuildsHistoryLimit: 5
failedBuildsHistoryLimit: 5
strategy:
type: Source
sourceStrategy:
from:
kind: ImageStreamTag
namespace: openshift
name: 'jboss-webserver31-tomcat7-openshift:1.1'
source:
type: Git
git:
uri: 'https://github.com/matallen/ninja-graphs.git'
ref: master
triggers:
- type: ImageChange
imageChange:
- type: ConfigChange
86 changes: 86 additions & 0 deletions mpplus/preprod--build/BuildConfig-ninja-board-base.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
kind: BuildConfig
apiVersion: build.openshift.io/v1
metadata:
name: ninja-board-base
namespace: giveback--build
spec:
nodeSelector: null
output:
to:
kind: ImageStreamTag
name: 'ninja-board-base:latest'
resources: {}
successfulBuildsHistoryLimit: 5
failedBuildsHistoryLimit: 5
strategy:
type: Docker
dockerStrategy:
from:
kind: ImageStreamTag
namespace: openshift
name: 'jboss-webserver31-tomcat7-openshift:1.1'
postCommit: {}
source:
type: Dockerfile
dockerfile: |-
FROM openshift/jboss-webserver31-tomcat7-openshift:latest
USER 0
# Copy entitlements
COPY ./etc-pki-entitlement /etc/pki/entitlement
# Copy keys
COPY ./etc-pki-consumer /etc/pki/consumer
COPY ./etc-pki-product /etc/pki/product
# Copy repository configuration
COPY ./etc-rhsm-conf /etc/rhsm/
COPY ./etc-rhsm-ca /etc/rhsm/ca
COPY ./usr-share-rhsmplugins /usr/share/rhsm-plugins
RUN rm -f /etc/rhsm-host && \
yum clean all && \
subscription-manager repos --disable='*' && \
subscription-manager repos --enable="rhel-7-server-rpms" && \
yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
INSTALL_PKGS="ca-certificates python2-pip python-requests pytz" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
yum clean all && \
pip install --no-cache-dir enum smartsheet-python-sdk && \
pip install --no-cache-dir urllib3 --upgrade && \
pip install --no-cache-dir enum34 && \
ln -s /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem /usr/lib/python2.7/site-packages/certifi/cacert.pem -f
RUN rm -rf /etc/pki/entitlement && \
rm -rf /etc/rhsm
USER 185
secrets:
- secret:
name: etc-pki-entitlement
destinationDir: etc-pki-entitlement
- secret:
name: consumer-keys
destinationDir: etc-pki-consumer
- secret:
name: product-keys
destinationDir: etc-pki-product
configMaps:
- configMap:
name: rhsm-conf
destinationDir: etc-rhsm-conf
- configMap:
name: rhsm-ca
destinationDir: etc-rhsm-ca
- configMap:
name: rhsmplugins
destinationDir: usr-share-rhsmplugins
triggers:
- type: ImageChange
imageChange:
lastTriggeredImageID: >-
image-registry.openshift-image-registry.svc:5000/openshift/jboss-webserver31-tomcat7-openshift@sha256:db8c51f756447deebe1e963e6f0880b86c0d000255301aabef89c35b18e3fdb8
- type: ConfigChange
runPolicy: Serial
34 changes: 34 additions & 0 deletions mpplus/preprod--build/BuildConfig-ninja-board.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
kind: BuildConfig
apiVersion: build.openshift.io/v1
metadata:
name: ninja-board
namespace: giveback--build
spec:
nodeSelector: null
output:
to:
kind: DockerImage
name: 'images.paas.redhat.com/giveback/ninja-board:latest'
pushSecret:
name: images-paas-push-config
postCommit: {}
resources: {}
runPolicy: Serial
successfulBuildsHistoryLimit: 5
failedBuildsHistoryLimit: 5
strategy:
type: Source
sourceStrategy:
from:
kind: ImageStreamTag
namespace: giveback--build
name: 'ninja-board-base:latest'
source:
type: Git
git:
uri: 'https://github.com/redhat-cop/ninja-board.git'
ref: v1.27
triggers:
- type: ImageChange
imageChange:
- type: ConfigChange
5 changes: 5 additions & 0 deletions mpplus/preprod--build/ImageStream-ninja-board-base.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
name: ninja-board-base
# namespace: giveback--build
5 changes: 5 additions & 0 deletions mpplus/preprod--build/ImageStream-ninja-graphs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
name: ninja-graphs
namespace: giveback--build
11 changes: 11 additions & 0 deletions mpplus/preprod--build/kustomization.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: giveback--build
commonLabels:
app.kubernetes.io/name: ninja-board
app.kubernetes.io/component: build
paas.redhat.com/appcode: GVBK-001
resources:
- ImageStream-ninja-board-base.yml
- BuildConfig-ninja-board-base.yml
- BuildConfig-ninja-board.yml
Loading

0 comments on commit 57008c0

Please sign in to comment.