Skip to content

Some initial changes to get things into a semi-working state. #2

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

Open
bb03 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Some initial changes to get things into a semi-working state. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3581bd2
Some initial changes to get things into a semi-working state. Still n…
May 20, 2020
a030ca8
Fixed mirror config
Jun 2, 2020
513b510
Updated config yaml
Jun 2, 2020
60983a8
updated config secret
Jun 2, 2020
6674d16
reverting postgres back, per comments
Jun 5, 2020
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 deploy/k8s/clair-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
Expand Down Expand Up @@ -37,4 +37,4 @@ spec:
volumes:
- name: configvolume
secret:
secretName: clair-scanner-config-secret
secretName: clair-scanner-config-secret
19 changes: 11 additions & 8 deletions deploy/k8s/postgres-clair-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
Expand All @@ -16,18 +16,21 @@ spec:
labels:
app: postgres-clair
spec:
securityContext:
runAsUser: 0
fsGroup: 0
containers:
- env:
- name: POSTGRESQL_USER
- name: POSTGRES_USER
# Set the username for the Clair postgres database (clair by default)
value: clair
- name: POSTGRESQL_DATABASE
- name: POSTGRES_DATABASE
# Set the name of the Clair postgres database
value: clair
- name: POSTGRESQL_PASSWORD
- name: POSTGRES_PASSWORD
# Set the password for the Clair postgress user
value: test123
image: registry.access.redhat.com/rhscl/postgresql-10-rhel7:1-35
image: registry.access.redhat.com/rhscl/postgresql-10-rhel7:1-35
imagePullPolicy: IfNotPresent
name: postgres-clair
ports:
Expand All @@ -36,9 +39,9 @@ spec:
volumeMounts:
- mountPath: /var/lib/pgsql/data
name: postgredb
serviceAccount: postgres
serviceAccountName: postgres
serviceAccount: postgres
serviceAccountName: postgres
volumes:
- name: postgredb
persistentVolumeClaim:
claimName: postgres-clair-storage
claimName: postgres-clair-storage
24 changes: 16 additions & 8 deletions deploy/k8s/postgres-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,46 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: postgres
namespace: quay-enterprise
labels:
app: postgres
spec:
# Only one instance of the postgres database is defined here. Adjust replicas based on demand.
replicas: 1
selector:
matchLabels:
app: postgres
template:
metadata:
labels:
app: postgres
spec:
securityContext:
runAsUser: 0
fsGroup: 0
containers:
- name: postgres
image: registry.access.redhat.com/rhscl/postgresql-10-rhel7:1-35
image: registry.access.redhat.com/rhscl/postgresql-10-rhel7:1-35
imagePullPolicy: "IfNotPresent"
ports:
- containerPort: 5432
env:
- name: POSTGRESQL_USER
- name: POSTGRES_USER
# Replace "username" with a name for your Postgres user
value: "username"
- name: POSTGRESQL_DATABASE
- name: POSTGRES_DATABASE
# Replace "password" with a password for your Postgres user
value: "quay"
- name: POSTGRESQL_PASSWORD
- name: POSTGRES_PASSWORD
value: "password"
volumeMounts:
- mountPath: /var/lib/pgsql/data
name: postgredb
serviceAccount: postgres
serviceAccountName: postgres
serviceAccount: postgres
serviceAccountName: postgres
volumes:
- name: postgredb
persistentVolumeClaim:
claimName: postgres-storage
claimName: postgres-storage
9 changes: 6 additions & 3 deletions deploy/k8s/quay-enterprise-app-rc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: quay-enterprise
Expand All @@ -18,14 +18,17 @@ spec:
labels:
quay-enterprise-component: app
spec:
securityContext:
fsGroup: 1001
volumes:
- name: configvolume
secret:
secretName: quay-enterprise-secret
secretName: quay-enterprise-config-secret
containers:
- name: quay-enterprise-app
# Pick the Quay version you wish to run
image: quay.io/redhat/quay:v3.1.0
image: quay.io/redhat/quay:v3.2.1
#8080 for non-ssl - useful when testing
ports:
- containerPort: 8443
volumeMounts:
Expand Down
8 changes: 7 additions & 1 deletion deploy/k8s/quay-enterprise-config-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,10 @@ apiVersion: v1
kind: Secret
metadata:
namespace: quay-enterprise
name: quay-enterprise-config-secret
name: quay-enterprise-config-secret
data:
# I had success by doing this 2-step process.
# Step 1: Spin up the quay-config service and use that to generate a config.yml. Download the config.yml locally
# Step 2: Use the following command to generate the secret
# 'kubectl create secret generic quay-enterprise-config-secret --from-file=config.yaml'
config.yml: <Base64 config file contents>
10 changes: 6 additions & 4 deletions deploy/k8s/quay-enterprise-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: quay-enterprise
Expand All @@ -17,12 +17,14 @@ spec:
labels:
quay-enterprise-component: config-app
spec:
securityContext:
fsGroup: 1001
containers:
- name: quay-enterprise-config-app
image: quay.io/redhat/quay:v3.1.0
image: quay.io/redhat/quay:v3.2.1
ports:
- containerPort: 8443
command: ["/quay-registry/quay-entrypoint.sh"]
args: ["config", "secret"]
args: ["config", "my-secret-password"]
imagePullSecrets:
- name: redhat-quay-pull-secret
- name: redhat-quay-pull-secret
17 changes: 14 additions & 3 deletions deploy/k8s/quay-enterprise-mirror.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: quay-enterprise
Expand All @@ -17,12 +17,23 @@ spec:
labels:
quay-enterprise-component: mirror-app
spec:
securityContext:
fsGroup: 1001
volumes:
- name: configvolume
secret:
secretName: quay-enterprise-config-secret
containers:
- name: quay-enterprise-mirror-app
image: quay.io/redhat/quay:v3.1.0
image: quay.io/redhat/quay:v3.2.1
ports:
- containerPort: 8443
command: ["/quay-registry/quay-entrypoint.sh"]
args: ["repomirror"]
volumeMounts:
- name: configvolume
readOnly: false
mountPath: /conf/stack
imagePullSecrets:
- name: redhat-quay-pull-secret
- name: redhat-quay-pull-secret

4 changes: 2 additions & 2 deletions deploy/k8s/quay-enterprise-redhat-quay-pull-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ metadata:
name: redhat-quay-pull-secret
data:
# Change <Add credentials> to include the credentials shown from https://access.redhat.com/solutions/3533201
.dockerconfigjson: <Add credentials>
type: kubernetes.io/dockerconfigjson
.dockerconfigjson: <Add credentials>
type: kubernetes.io/dockerconfigjson
4 changes: 2 additions & 2 deletions deploy/k8s/quay-enterprise-redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: quay-enterprise
Expand Down Expand Up @@ -36,4 +36,4 @@ spec:
ports:
- port: 6379
selector:
quay-enterprise-component: redis
quay-enterprise-component: redis
5 changes: 5 additions & 0 deletions deploy/k8s/quay-postgres-service-account.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: postgres