Skip to content

RabbitMq and GCS Changes #120

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
saitejaopsmx wants to merge 4 commits into
base: 2025-04-02
Choose a base branch
from
Open

RabbitMq and GCS Changes #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91a9224
updated the Adhoc scan
saitejaopsmx Jun 20, 2025
99a1044
Updated the Job
saitejaopsmx Jul 1, 2025
5802870
Updated the GCS Integrator
saitejaopsmx Jul 4, 2025
f08ff07
Updated the gcs config
saitejaopsmx Jul 7, 2025
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
8 changes: 0 additions & 8 deletions charts/ssd/config/project-monitor/app-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
source-scan:
username: 'rabbitmq'
password: 'Networks123'
host: rabbitmq-service
port: 5672
queue: source-scan
exchange: echo.events
bindingKey: source-scan
artifact-scan:
username: 'rabbitmq'
password: 'Networks123'
host: rabbitmq-service
port: 5672
queue: artifact-scan
exchange: echo.events
bindingKey: artifact-scan
21 changes: 21 additions & 0 deletions charts/ssd/config/ssd-ui/help-text.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1664,6 +1664,27 @@
}
}
},
"GCS": {
"HEADER": "Google Container Storage",
"BODY": "",
"NAME": {
"TOOLTIP": "",
"VALIDATION_MESSAGE": {
"noSpecialCharacters": "Account Name cannot contain special characters other than _ and -",
"cannotContainSpace": "Account Name cannot contain space",
"required": "Account Name cannot be empty",
"startingFromNumber": "Account Name cannot start with numbers",
"minlength": "Account Name should be more than 2 characters",
"invalidName": "Please choose another account name; User generated account can't be named `default`"
}
},
"FILEDATA": {
"VALIDATION_MESSAGE": {
"required": "File cannot be empty",
"invalidValue": "File is invalid"
}
}
},
"GCR": {
"HEADER": "Google Container Registry",
"BODY": "Host and manage container images with Google Container Registry for scalable and secure deployments.",
Expand Down
68 changes: 68 additions & 0 deletions charts/ssd/config/ssd-ui/integrators-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2014,6 +2014,74 @@
}
]
},
{
"integratorType": "gcs",
"displayName": "GCS",
"multiSupport": true,
"deleteAccount": true,
"category": "dockerregistry",
"testConnectionFlag": false,
"integratorConfigs": {
"name": {
"displayName": "Account Name",
"dataType": "input",
"required": true,
"regexpValue": "^[^`~!@#$%\\^&*()+={}|[\\]\\:';\\\\\"<>?,./]*$",
"regexType": "noSpecialCharacters",
"helpText": "",
"placeholderText": "opsmx-accountname"
},
"repo": {
"dataType": "chipset",
"displayName": "Approved Artifact Repo",
"helpText": "GCS Repo Name",
"placeholderText": "Example:GCS HOSTURL/<PROJECT_NAME>/<REPO_NAME>",
"required": false,
"encrypt": false
},
"fileData": {
"displayName": "Upload File",
"dataType": "file",
"required": true,
"helpText": "select",
"placeholderText": "choose file"
}
},
"gridConfigs": [
{
"name": "Account Name",
"prop": "name",
"type": "default",
"width": 160,
"sortable": false,
"defatultVisibility": true
},
{
"name": "Team",
"prop": "team",
"type": "chipSet",
"width": 130,
"sortable": false,
"defatultVisibility": true
},
{
"name": "Environment",
"prop": "environments",
"type": "chipSet",
"width": 130,
"sortable": false,
"defatultVisibility": true
},
{
"name": "Status",
"prop": "status",
"type": "toggleSwitch",
"width": 80,
"sortable": false,
"defatultVisibility": true
}
]
},
{
"integratorType": "gcr",
"displayName": "GCR",
Expand Down
10 changes: 10 additions & 0 deletions charts/ssd/config/supplychain-api/ssd-integrations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,16 @@ integrationData:
encrypt: false
fileData:
encrypt: true
- integratorType: gcs
category: dockerregistry
multiaccount: false
integratorConfigs:
repo:
encrypt: false
fileName:
encrypt: false
fileData:
encrypt: true
- integratorType: ecr
category: dockerregistry
multiaccount: true
Expand Down
15 changes: 15 additions & 0 deletions charts/ssd/templates/artifact-scan/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@ spec:
containers:
- name: artifact-scan
image: {{ template "artifactscan.image" . }}
env:
- name: RABBITMQ_HOST
value: rabbitmq-service
- name: RABBITMQ_PORT
value: "5672"
- name: RABBITMQ_USERNAME
valueFrom:
secretKeyRef:
key: username
name: rabbitmq-secret
- name: RABBITMQ_PASSWORD
valueFrom:
secretKeyRef:
key: password
name: rabbitmq-secret
volumeMounts:
- name: ssd-public-keys
mountPath: /app/ssd-public-keys
Expand Down
5 changes: 3 additions & 2 deletions charts/ssd/templates/automation/automation-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ spec:
kubectl -n {{ .Release.Namespace }} exec -it $frontendpod -- /bin/bash -c "tctl --ns ssd-opa namespace register -rd 3"
kubectl -n {{ .Release.Namespace }} rollout restart deploy tool-chain
kubectl -n {{ .Release.Namespace }} rollout restart deploy ssd-opa
break
{{- end }}
else
if [ $wait_period -gt 1000 ]; then
Expand All @@ -87,9 +88,8 @@ spec:
kubectl get pods -n {{ .Release.Namespace }} -o jsonpath='{range .items[*]}{..metadata.name}{"\t"}{..containerStatuses..ready}{"\n"}{end}' > live.status
DGRAPH=$(grep dgraph-0 live.status | awk '{print $2}')
SUPPLYCHAINAPI=$(grep supplychain-api live.status | awk '{print $2}')
status=$(kubectl get pods -n {{ .Release.Namespace }} -l component=db --field-selector=status.phase=Running --no-headers=true | awk '{print $2}')
wait_period=$(($wait_period+10))
if [ "$DGRAPH" == "true" ] && [ "$SUPPLYCHAINAPI" == "true" ] && [ "$status" == "1/1" ]; then
if [ "$DGRAPH" == "true" ] && [ "$SUPPLYCHAINAPI" == "true" ]; then
sleep 10
echo "############******Adding the Dgraph Schema*********#######################"
SCHEMA_CHECK=`curl -X POST -H "Content-Type: application/json" --data-binary "$(cat /tmp/schema/schema.graphql)" $schema_endpoint`
Expand Down Expand Up @@ -133,6 +133,7 @@ spec:
kubectl -n {{ .Release.Namespace }} exec -it $frontendpod -- /bin/bash -c "tctl --ns ssd-opa namespace register -rd 3"
kubectl -n {{ .Release.Namespace }} rollout restart deploy tool-chain
kubectl -n {{ .Release.Namespace }} rollout restart deploy ssd-opa
break
{{- end }}

else
Expand Down
15 changes: 15 additions & 0 deletions charts/ssd/templates/project-monitor/project-monitor-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,21 @@ spec:
containers:
- name: project-monitor
image: {{ template "projectmonitor.image" . }}
env:
- name: RABBITMQ_HOST
value: rabbitmq-service
- name: RABBITMQ_PORT
value: "5672"
- name: RABBITMQ_USERNAME
valueFrom:
secretKeyRef:
key: username
name: rabbitmq-secret
- name: RABBITMQ_PASSWORD
valueFrom:
secretKeyRef:
key: password
name: rabbitmq-secret
volumeMounts:
- name: ssd-public-keys
mountPath: /app/ssd-public-keys
Expand Down
15 changes: 15 additions & 0 deletions charts/ssd/templates/source-scan/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@ spec:
containers:
- name: source-scan
image: {{ template "sourcescan.image" . }}
env:
- name: RABBITMQ_HOST
value: rabbitmq-service
- name: RABBITMQ_PORT
value: "5672"
- name: RABBITMQ_USERNAME
valueFrom:
secretKeyRef:
key: username
name: rabbitmq-secret
- name: RABBITMQ_PASSWORD
valueFrom:
secretKeyRef:
key: password
name: rabbitmq-secret
volumeMounts:
- name: ssd-public-keys
mountPath: /app/ssd-public-keys
Expand Down