Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion chart/infra-server/Chart.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ sources:
- https://github.com/stackrox/infra
annotations:
acsDemoVersion: 4.11.2
automationFlavorsVersion: 0.15.5
automationFlavorsVersion: 0.16.0-2-g65a204651e-snapshot
ocpCredentialsMode: Passthrough
dependencies:
- name: argo-workflows
Expand Down
64 changes: 48 additions & 16 deletions chart/infra-server/static/flavors.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -379,18 +379,16 @@
value: example1

- name: central-services-helm-chart-version
description: Central Services Helm chart version
description: Central Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Central Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Central Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: secured-cluster-services-helm-chart-version
description: Secured Cluster Services Helm chart version
description: Secured Cluster Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Secured Cluster Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Secured Cluster Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: openshift-version
description: openshift release from OCP, OCP dev preview, or OKD
Expand DownExpand Up@@ -421,45 +419,79 @@
value: ""
kind: optional
help: |
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Default will be
derived from the Helm chart. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Defaults to
quay.io/stackrox-io. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
quay.io/rhacs-eng and all publicly accessible images.

- name: main-image-tag
description: Main container image tag
value: ""
kind: optional
help: |
Version string of the main container image tag. Default will be derived from the Helm chart.
Version string of the main container image tag.

- name: scanner-image-tag
description: Scanner container image tag
value: ""
kind: optional
help: |
Version string of the scanner container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner container image tag.

- name: scanner-db-image-tag
description: Scanner DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-db container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db container image tag.

- name: scanner-slim-image-tag
description: Scanner Slim container image tag
value: ""
kind: optional
help: |
Version string of the scanner-slim container image tag.

- name: collector-slim-image-tag
description: Collector Slim container image tag
- name: scanner-db-slim-image-tag
description: Scanner DB Slim container image tag
value: ""
kind: optional
help: |
Version string of the collector-slim container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db-slim container image tag.

- name: collector-image-tag
description: Collector container image tag
value: ""
kind: optional
help: |
Version string of the collector container image tag.

- name: central-db-image-tag
description: Central DB container image tag
value: ""
kind: optional
help: |
Version string of the central-db container image tag to use. Setting this value will enable central-db.
Default will be derived from the Helm chart.
Version string of the central-db container image tag.

- name: scanner-v4-image-tag
description: Scanner V4 container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4 container image tag.

- name: scanner-v4-db-image-tag
description: Scanner V4 DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4-db container image tag.

- name: fact-image-tag
description: Fact container image tag
value: ""
kind: optional
help: |
Version string of the fact container image tag.

- name: trusted-certs-enabled
description: Should trusted certificates be created
Expand Down
90 changes: 25 additions & 65 deletions chart/infra-server/static/workflow-openshift-4-demo.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,13 @@ spec:
- name: main-image-tag
- name: scanner-image-tag
- name: scanner-db-image-tag
- name: collector-slim-image-tag
- name: scanner-slim-image-tag
- name: scanner-db-slim-image-tag
- name: collector-image-tag
- name: central-db-image-tag
- name: scanner-v4-image-tag
- name: scanner-v4-db-image-tag
- name: fact-image-tag
- name: central-services-helm-chart-version
- name: secured-cluster-services-helm-chart-version
- name: trusted-certs-enabled
Expand DownExpand Up@@ -53,27 +58,14 @@ spec:
- - name: pre-install
template: pre-install

- - name: roxctl-central
template: roxctl-central

- - name: roxctl-secured-cluster-services
template: roxctl-secured-cluster-services

- - name: run-ansible-demo
template: run-ansible-demo
continueOn:
failed: true
arguments:
parameters:
- name: admin-password
value: '{{ "{{" }}steps.pre-install.outputs.parameters.admin-password{{ "}}" }}'
- name: kubeconfig-base64
value: '{{ "{{" }}steps.pre-install.outputs.parameters.kubeconfig-base64{{ "}}" }}'
artifacts:
- name: roxctl-central
from: '{{ "{{" }}steps.roxctl-central.outputs.artifacts.roxctl-central{{ "}}" }}'
- name: roxctl-secured-cluster-services
from: '{{ "{{" }}steps.roxctl-secured-cluster-services.outputs.artifacts.roxctl-secured-cluster-services{{ "}}" }}'

- - name: gather
template: gather
Expand All@@ -88,7 +80,7 @@ spec:

- name: create
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs to be reverted before merging.

Suggested change
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}

imagePullPolicy: Always
volumeMounts:
- name: data
Expand DownExpand Up@@ -147,30 +139,20 @@ spec:
mountPath: /data
command: [sh]
source: |
openssl rand -base64 32 | tr "+/" "_#" | cut -c 1-20 > /data/admin_password
base64 /data/auth/kubeconfig | tr -d "\n" > /data/auth/kubeconfig_base64
subdomain=apps.{{ "{{" }}workflow.parameters.name{{ "}}" }}.ocp.infra.rox.systems
echo "https://console-openshift-console.${subdomain}" > /data/url-openshift
echo "https://central-stackrox.${subdomain}" > /data/url-stackrox
outputs:
parameters:
- name: admin-password
valueFrom:
path: /data/admin_password
- name: kubeconfig-base64
valueFrom:
path: /data/auth/kubeconfig_base64

- name: run-ansible-demo
inputs:
parameters:
- name: admin-password
- name: kubeconfig-base64
artifacts:
- name: roxctl-central
path: /usr/bin/roxctl-central
- name: roxctl-secured-cluster-services
path: /usr/bin/roxctl-secured-cluster-services
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
Expand All@@ -195,10 +177,6 @@ spec:
key: google-credentials.json
- name: CENTRAL_PORT
value: "443"
- name: ORCHESTRATOR
value: openshift
- name: ADMIN_PASSWORD
value: '{{ "{{" }}inputs.parameters.admin-password{{ "}}" }}'
- name: KUBECONFIG_BASE64
value: '{{ "{{" }}inputs.parameters.kubeconfig-base64{{ "}}" }}'
- name: IMAGE_REGISTRY
Expand All@@ -209,10 +187,24 @@ spec:
value: '{{ "{{" }}workflow.parameters.scanner-image-tag{{ "}}" }}'
- name: SCANNER_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-image-tag{{ "}}" }}'
- name: COLLECTOR_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-slim-image-tag{{ "}}" }}'
- name: SCANNER_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-slim-image-tag{{ "}}" }}'
- name: SCANNER_DB_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-slim-image-tag{{ "}}" }}'
- name: COLLECTOR_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-image-tag{{ "}}" }}'
- name: CENTRAL_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.central-db-image-tag{{ "}}" }}'
- name: SCANNER_V4_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-image-tag{{ "}}" }}'
- name: SCANNER_V4_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-db-image-tag{{ "}}" }}'
- name: FACT_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.fact-image-tag{{ "}}" }}'
- name: CENTRAL_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
- name: SECURED_CLUSTER_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
- name: ANSIBLE_STDOUT_CALLBACK
value: debug
volumeMounts:
Expand All@@ -236,6 +228,7 @@ spec:
artifacts:
- name: admin-password
path: /data/admin_password
optional: true
archive:
none: {}
- name: kubeconfig
Expand DownExpand Up@@ -280,7 +273,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
imagePullPolicy: Always
command:
- entrypoint.sh
Expand All@@ -299,36 +292,3 @@ spec:
- name: data
mountPath: /data

- name: roxctl-central
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-central
path: /tmp/roxctl-central
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-central

- name: roxctl-secured-cluster-services
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-secured-cluster-services
path: /tmp/roxctl-secured-cluster-services
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-secured-cluster-services
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ROX-35433: Replace Helm install with roxie in openshift-4-demo by vladbologa · Pull Request #1903 · stackrox/infra · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion chart/infra-server/Chart.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ sources:
- https://github.com/stackrox/infra
annotations:
acsDemoVersion: 4.11.2
automationFlavorsVersion: 0.15.5
automationFlavorsVersion: 0.16.0-2-g65a204651e-snapshot
ocpCredentialsMode: Passthrough
dependencies:
- name: argo-workflows
Expand Down
64 changes: 48 additions & 16 deletions chart/infra-server/static/flavors.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -379,18 +379,16 @@
value: example1

- name: central-services-helm-chart-version
description: Central Services Helm chart version
description: Central Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Central Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Central Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: secured-cluster-services-helm-chart-version
description: Secured Cluster Services Helm chart version
description: Secured Cluster Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Secured Cluster Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Secured Cluster Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: openshift-version
description: openshift release from OCP, OCP dev preview, or OKD
Expand DownExpand Up@@ -421,45 +419,79 @@
value: ""
kind: optional
help: |
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Default will be
derived from the Helm chart. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Defaults to
quay.io/stackrox-io. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
quay.io/rhacs-eng and all publicly accessible images.

- name: main-image-tag
description: Main container image tag
value: ""
kind: optional
help: |
Version string of the main container image tag. Default will be derived from the Helm chart.
Version string of the main container image tag.

- name: scanner-image-tag
description: Scanner container image tag
value: ""
kind: optional
help: |
Version string of the scanner container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner container image tag.

- name: scanner-db-image-tag
description: Scanner DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-db container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db container image tag.

- name: scanner-slim-image-tag
description: Scanner Slim container image tag
value: ""
kind: optional
help: |
Version string of the scanner-slim container image tag.

- name: collector-slim-image-tag
description: Collector Slim container image tag
- name: scanner-db-slim-image-tag
description: Scanner DB Slim container image tag
value: ""
kind: optional
help: |
Version string of the collector-slim container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db-slim container image tag.

- name: collector-image-tag
description: Collector container image tag
value: ""
kind: optional
help: |
Version string of the collector container image tag.

- name: central-db-image-tag
description: Central DB container image tag
value: ""
kind: optional
help: |
Version string of the central-db container image tag to use. Setting this value will enable central-db.
Default will be derived from the Helm chart.
Version string of the central-db container image tag.

- name: scanner-v4-image-tag
description: Scanner V4 container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4 container image tag.

- name: scanner-v4-db-image-tag
description: Scanner V4 DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4-db container image tag.

- name: fact-image-tag
description: Fact container image tag
value: ""
kind: optional
help: |
Version string of the fact container image tag.

- name: trusted-certs-enabled
description: Should trusted certificates be created
Expand Down
90 changes: 25 additions & 65 deletions chart/infra-server/static/workflow-openshift-4-demo.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,13 @@ spec:
- name: main-image-tag
- name: scanner-image-tag
- name: scanner-db-image-tag
- name: collector-slim-image-tag
- name: scanner-slim-image-tag
- name: scanner-db-slim-image-tag
- name: collector-image-tag
- name: central-db-image-tag
- name: scanner-v4-image-tag
- name: scanner-v4-db-image-tag
- name: fact-image-tag
- name: central-services-helm-chart-version
- name: secured-cluster-services-helm-chart-version
- name: trusted-certs-enabled
Expand DownExpand Up@@ -53,27 +58,14 @@ spec:
- - name: pre-install
template: pre-install

- - name: roxctl-central
template: roxctl-central

- - name: roxctl-secured-cluster-services
template: roxctl-secured-cluster-services

- - name: run-ansible-demo
template: run-ansible-demo
continueOn:
failed: true
arguments:
parameters:
- name: admin-password
value: '{{ "{{" }}steps.pre-install.outputs.parameters.admin-password{{ "}}" }}'
- name: kubeconfig-base64
value: '{{ "{{" }}steps.pre-install.outputs.parameters.kubeconfig-base64{{ "}}" }}'
artifacts:
- name: roxctl-central
from: '{{ "{{" }}steps.roxctl-central.outputs.artifacts.roxctl-central{{ "}}" }}'
- name: roxctl-secured-cluster-services
from: '{{ "{{" }}steps.roxctl-secured-cluster-services.outputs.artifacts.roxctl-secured-cluster-services{{ "}}" }}'

- - name: gather
template: gather
Expand All@@ -88,7 +80,7 @@ spec:

- name: create
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs to be reverted before merging.

Suggested change
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}

imagePullPolicy: Always
volumeMounts:
- name: data
Expand DownExpand Up@@ -147,30 +139,20 @@ spec:
mountPath: /data
command: [sh]
source: |
openssl rand -base64 32 | tr "+/" "_#" | cut -c 1-20 > /data/admin_password
base64 /data/auth/kubeconfig | tr -d "\n" > /data/auth/kubeconfig_base64
subdomain=apps.{{ "{{" }}workflow.parameters.name{{ "}}" }}.ocp.infra.rox.systems
echo "https://console-openshift-console.${subdomain}" > /data/url-openshift
echo "https://central-stackrox.${subdomain}" > /data/url-stackrox
outputs:
parameters:
- name: admin-password
valueFrom:
path: /data/admin_password
- name: kubeconfig-base64
valueFrom:
path: /data/auth/kubeconfig_base64

- name: run-ansible-demo
inputs:
parameters:
- name: admin-password
- name: kubeconfig-base64
artifacts:
- name: roxctl-central
path: /usr/bin/roxctl-central
- name: roxctl-secured-cluster-services
path: /usr/bin/roxctl-secured-cluster-services
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
Expand All@@ -195,10 +177,6 @@ spec:
key: google-credentials.json
- name: CENTRAL_PORT
value: "443"
- name: ORCHESTRATOR
value: openshift
- name: ADMIN_PASSWORD
value: '{{ "{{" }}inputs.parameters.admin-password{{ "}}" }}'
- name: KUBECONFIG_BASE64
value: '{{ "{{" }}inputs.parameters.kubeconfig-base64{{ "}}" }}'
- name: IMAGE_REGISTRY
Expand All@@ -209,10 +187,24 @@ spec:
value: '{{ "{{" }}workflow.parameters.scanner-image-tag{{ "}}" }}'
- name: SCANNER_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-image-tag{{ "}}" }}'
- name: COLLECTOR_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-slim-image-tag{{ "}}" }}'
- name: SCANNER_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-slim-image-tag{{ "}}" }}'
- name: SCANNER_DB_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-slim-image-tag{{ "}}" }}'
- name: COLLECTOR_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-image-tag{{ "}}" }}'
- name: CENTRAL_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.central-db-image-tag{{ "}}" }}'
- name: SCANNER_V4_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-image-tag{{ "}}" }}'
- name: SCANNER_V4_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-db-image-tag{{ "}}" }}'
- name: FACT_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.fact-image-tag{{ "}}" }}'
- name: CENTRAL_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
- name: SECURED_CLUSTER_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
- name: ANSIBLE_STDOUT_CALLBACK
value: debug
volumeMounts:
Expand All@@ -236,6 +228,7 @@ spec:
artifacts:
- name: admin-password
path: /data/admin_password
optional: true
archive:
none: {}
- name: kubeconfig
Expand DownExpand Up@@ -280,7 +273,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
imagePullPolicy: Always
command:
- entrypoint.sh
Expand All@@ -299,36 +292,3 @@ spec:
- name: data
mountPath: /data

- name: roxctl-central
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-central
path: /tmp/roxctl-central
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-central

- name: roxctl-secured-cluster-services
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-secured-cluster-services
path: /tmp/roxctl-secured-cluster-services
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-secured-cluster-services
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ROX-35433: Replace Helm install with roxie in openshift-4-demo by vladbologa · Pull Request #1903 · stackrox/infra · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion chart/infra-server/Chart.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ sources:
- https://github.com/stackrox/infra
annotations:
acsDemoVersion: 4.11.2
automationFlavorsVersion: 0.15.5
automationFlavorsVersion: 0.16.0-2-g65a204651e-snapshot
ocpCredentialsMode: Passthrough
dependencies:
- name: argo-workflows
Expand Down
64 changes: 48 additions & 16 deletions chart/infra-server/static/flavors.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -379,18 +379,16 @@
value: example1

- name: central-services-helm-chart-version
description: Central Services Helm chart version
description: Central Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Central Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Central Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: secured-cluster-services-helm-chart-version
description: Secured Cluster Services Helm chart version
description: Secured Cluster Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Secured Cluster Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Secured Cluster Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: openshift-version
description: openshift release from OCP, OCP dev preview, or OKD
Expand DownExpand Up@@ -421,45 +419,79 @@
value: ""
kind: optional
help: |
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Default will be
derived from the Helm chart. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Defaults to
quay.io/stackrox-io. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
quay.io/rhacs-eng and all publicly accessible images.

- name: main-image-tag
description: Main container image tag
value: ""
kind: optional
help: |
Version string of the main container image tag. Default will be derived from the Helm chart.
Version string of the main container image tag.

- name: scanner-image-tag
description: Scanner container image tag
value: ""
kind: optional
help: |
Version string of the scanner container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner container image tag.

- name: scanner-db-image-tag
description: Scanner DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-db container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db container image tag.

- name: scanner-slim-image-tag
description: Scanner Slim container image tag
value: ""
kind: optional
help: |
Version string of the scanner-slim container image tag.

- name: collector-slim-image-tag
description: Collector Slim container image tag
- name: scanner-db-slim-image-tag
description: Scanner DB Slim container image tag
value: ""
kind: optional
help: |
Version string of the collector-slim container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db-slim container image tag.

- name: collector-image-tag
description: Collector container image tag
value: ""
kind: optional
help: |
Version string of the collector container image tag.

- name: central-db-image-tag
description: Central DB container image tag
value: ""
kind: optional
help: |
Version string of the central-db container image tag to use. Setting this value will enable central-db.
Default will be derived from the Helm chart.
Version string of the central-db container image tag.

- name: scanner-v4-image-tag
description: Scanner V4 container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4 container image tag.

- name: scanner-v4-db-image-tag
description: Scanner V4 DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4-db container image tag.

- name: fact-image-tag
description: Fact container image tag
value: ""
kind: optional
help: |
Version string of the fact container image tag.

- name: trusted-certs-enabled
description: Should trusted certificates be created
Expand Down
90 changes: 25 additions & 65 deletions chart/infra-server/static/workflow-openshift-4-demo.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,13 @@ spec:
- name: main-image-tag
- name: scanner-image-tag
- name: scanner-db-image-tag
- name: collector-slim-image-tag
- name: scanner-slim-image-tag
- name: scanner-db-slim-image-tag
- name: collector-image-tag
- name: central-db-image-tag
- name: scanner-v4-image-tag
- name: scanner-v4-db-image-tag
- name: fact-image-tag
- name: central-services-helm-chart-version
- name: secured-cluster-services-helm-chart-version
- name: trusted-certs-enabled
Expand DownExpand Up@@ -53,27 +58,14 @@ spec:
- - name: pre-install
template: pre-install

- - name: roxctl-central
template: roxctl-central

- - name: roxctl-secured-cluster-services
template: roxctl-secured-cluster-services

- - name: run-ansible-demo
template: run-ansible-demo
continueOn:
failed: true
arguments:
parameters:
- name: admin-password
value: '{{ "{{" }}steps.pre-install.outputs.parameters.admin-password{{ "}}" }}'
- name: kubeconfig-base64
value: '{{ "{{" }}steps.pre-install.outputs.parameters.kubeconfig-base64{{ "}}" }}'
artifacts:
- name: roxctl-central
from: '{{ "{{" }}steps.roxctl-central.outputs.artifacts.roxctl-central{{ "}}" }}'
- name: roxctl-secured-cluster-services
from: '{{ "{{" }}steps.roxctl-secured-cluster-services.outputs.artifacts.roxctl-secured-cluster-services{{ "}}" }}'

- - name: gather
template: gather
Expand All@@ -88,7 +80,7 @@ spec:

- name: create
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs to be reverted before merging.

Suggested change
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}

imagePullPolicy: Always
volumeMounts:
- name: data
Expand DownExpand Up@@ -147,30 +139,20 @@ spec:
mountPath: /data
command: [sh]
source: |
openssl rand -base64 32 | tr "+/" "_#" | cut -c 1-20 > /data/admin_password
base64 /data/auth/kubeconfig | tr -d "\n" > /data/auth/kubeconfig_base64
subdomain=apps.{{ "{{" }}workflow.parameters.name{{ "}}" }}.ocp.infra.rox.systems
echo "https://console-openshift-console.${subdomain}" > /data/url-openshift
echo "https://central-stackrox.${subdomain}" > /data/url-stackrox
outputs:
parameters:
- name: admin-password
valueFrom:
path: /data/admin_password
- name: kubeconfig-base64
valueFrom:
path: /data/auth/kubeconfig_base64

- name: run-ansible-demo
inputs:
parameters:
- name: admin-password
- name: kubeconfig-base64
artifacts:
- name: roxctl-central
path: /usr/bin/roxctl-central
- name: roxctl-secured-cluster-services
path: /usr/bin/roxctl-secured-cluster-services
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
Expand All@@ -195,10 +177,6 @@ spec:
key: google-credentials.json
- name: CENTRAL_PORT
value: "443"
- name: ORCHESTRATOR
value: openshift
- name: ADMIN_PASSWORD
value: '{{ "{{" }}inputs.parameters.admin-password{{ "}}" }}'
- name: KUBECONFIG_BASE64
value: '{{ "{{" }}inputs.parameters.kubeconfig-base64{{ "}}" }}'
- name: IMAGE_REGISTRY
Expand All@@ -209,10 +187,24 @@ spec:
value: '{{ "{{" }}workflow.parameters.scanner-image-tag{{ "}}" }}'
- name: SCANNER_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-image-tag{{ "}}" }}'
- name: COLLECTOR_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-slim-image-tag{{ "}}" }}'
- name: SCANNER_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-slim-image-tag{{ "}}" }}'
- name: SCANNER_DB_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-slim-image-tag{{ "}}" }}'
- name: COLLECTOR_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-image-tag{{ "}}" }}'
- name: CENTRAL_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.central-db-image-tag{{ "}}" }}'
- name: SCANNER_V4_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-image-tag{{ "}}" }}'
- name: SCANNER_V4_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-db-image-tag{{ "}}" }}'
- name: FACT_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.fact-image-tag{{ "}}" }}'
- name: CENTRAL_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
- name: SECURED_CLUSTER_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
- name: ANSIBLE_STDOUT_CALLBACK
value: debug
volumeMounts:
Expand All@@ -236,6 +228,7 @@ spec:
artifacts:
- name: admin-password
path: /data/admin_password
optional: true
archive:
none: {}
- name: kubeconfig
Expand DownExpand Up@@ -280,7 +273,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
imagePullPolicy: Always
command:
- entrypoint.sh
Expand All@@ -299,36 +292,3 @@ spec:
- name: data
mountPath: /data

- name: roxctl-central
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-central
path: /tmp/roxctl-central
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-central

- name: roxctl-secured-cluster-services
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-secured-cluster-services
path: /tmp/roxctl-secured-cluster-services
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-secured-cluster-services
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ROX-35433: Replace Helm install with roxie in openshift-4-demo by vladbologa · Pull Request #1903 · stackrox/infra · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion chart/infra-server/Chart.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ sources:
- https://github.com/stackrox/infra
annotations:
acsDemoVersion: 4.11.2
automationFlavorsVersion: 0.15.5
automationFlavorsVersion: 0.16.0-2-g65a204651e-snapshot
ocpCredentialsMode: Passthrough
dependencies:
- name: argo-workflows
Expand Down
64 changes: 48 additions & 16 deletions chart/infra-server/static/flavors.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -379,18 +379,16 @@
value: example1

- name: central-services-helm-chart-version
description: Central Services Helm chart version
description: Central Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Central Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Central Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: secured-cluster-services-helm-chart-version
description: Secured Cluster Services Helm chart version
description: Secured Cluster Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Secured Cluster Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Secured Cluster Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: openshift-version
description: openshift release from OCP, OCP dev preview, or OKD
Expand DownExpand Up@@ -421,45 +419,79 @@
value: ""
kind: optional
help: |
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Default will be
derived from the Helm chart. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Defaults to
quay.io/stackrox-io. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
quay.io/rhacs-eng and all publicly accessible images.

- name: main-image-tag
description: Main container image tag
value: ""
kind: optional
help: |
Version string of the main container image tag. Default will be derived from the Helm chart.
Version string of the main container image tag.

- name: scanner-image-tag
description: Scanner container image tag
value: ""
kind: optional
help: |
Version string of the scanner container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner container image tag.

- name: scanner-db-image-tag
description: Scanner DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-db container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db container image tag.

- name: scanner-slim-image-tag
description: Scanner Slim container image tag
value: ""
kind: optional
help: |
Version string of the scanner-slim container image tag.

- name: collector-slim-image-tag
description: Collector Slim container image tag
- name: scanner-db-slim-image-tag
description: Scanner DB Slim container image tag
value: ""
kind: optional
help: |
Version string of the collector-slim container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db-slim container image tag.

- name: collector-image-tag
description: Collector container image tag
value: ""
kind: optional
help: |
Version string of the collector container image tag.

- name: central-db-image-tag
description: Central DB container image tag
value: ""
kind: optional
help: |
Version string of the central-db container image tag to use. Setting this value will enable central-db.
Default will be derived from the Helm chart.
Version string of the central-db container image tag.

- name: scanner-v4-image-tag
description: Scanner V4 container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4 container image tag.

- name: scanner-v4-db-image-tag
description: Scanner V4 DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4-db container image tag.

- name: fact-image-tag
description: Fact container image tag
value: ""
kind: optional
help: |
Version string of the fact container image tag.

- name: trusted-certs-enabled
description: Should trusted certificates be created
Expand Down
90 changes: 25 additions & 65 deletions chart/infra-server/static/workflow-openshift-4-demo.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,13 @@ spec:
- name: main-image-tag
- name: scanner-image-tag
- name: scanner-db-image-tag
- name: collector-slim-image-tag
- name: scanner-slim-image-tag
- name: scanner-db-slim-image-tag
- name: collector-image-tag
- name: central-db-image-tag
- name: scanner-v4-image-tag
- name: scanner-v4-db-image-tag
- name: fact-image-tag
- name: central-services-helm-chart-version
- name: secured-cluster-services-helm-chart-version
- name: trusted-certs-enabled
Expand DownExpand Up@@ -53,27 +58,14 @@ spec:
- - name: pre-install
template: pre-install

- - name: roxctl-central
template: roxctl-central

- - name: roxctl-secured-cluster-services
template: roxctl-secured-cluster-services

- - name: run-ansible-demo
template: run-ansible-demo
continueOn:
failed: true
arguments:
parameters:
- name: admin-password
value: '{{ "{{" }}steps.pre-install.outputs.parameters.admin-password{{ "}}" }}'
- name: kubeconfig-base64
value: '{{ "{{" }}steps.pre-install.outputs.parameters.kubeconfig-base64{{ "}}" }}'
artifacts:
- name: roxctl-central
from: '{{ "{{" }}steps.roxctl-central.outputs.artifacts.roxctl-central{{ "}}" }}'
- name: roxctl-secured-cluster-services
from: '{{ "{{" }}steps.roxctl-secured-cluster-services.outputs.artifacts.roxctl-secured-cluster-services{{ "}}" }}'

- - name: gather
template: gather
Expand All@@ -88,7 +80,7 @@ spec:

- name: create
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs to be reverted before merging.

Suggested change
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}

imagePullPolicy: Always
volumeMounts:
- name: data
Expand DownExpand Up@@ -147,30 +139,20 @@ spec:
mountPath: /data
command: [sh]
source: |
openssl rand -base64 32 | tr "+/" "_#" | cut -c 1-20 > /data/admin_password
base64 /data/auth/kubeconfig | tr -d "\n" > /data/auth/kubeconfig_base64
subdomain=apps.{{ "{{" }}workflow.parameters.name{{ "}}" }}.ocp.infra.rox.systems
echo "https://console-openshift-console.${subdomain}" > /data/url-openshift
echo "https://central-stackrox.${subdomain}" > /data/url-stackrox
outputs:
parameters:
- name: admin-password
valueFrom:
path: /data/admin_password
- name: kubeconfig-base64
valueFrom:
path: /data/auth/kubeconfig_base64

- name: run-ansible-demo
inputs:
parameters:
- name: admin-password
- name: kubeconfig-base64
artifacts:
- name: roxctl-central
path: /usr/bin/roxctl-central
- name: roxctl-secured-cluster-services
path: /usr/bin/roxctl-secured-cluster-services
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
Expand All@@ -195,10 +177,6 @@ spec:
key: google-credentials.json
- name: CENTRAL_PORT
value: "443"
- name: ORCHESTRATOR
value: openshift
- name: ADMIN_PASSWORD
value: '{{ "{{" }}inputs.parameters.admin-password{{ "}}" }}'
- name: KUBECONFIG_BASE64
value: '{{ "{{" }}inputs.parameters.kubeconfig-base64{{ "}}" }}'
- name: IMAGE_REGISTRY
Expand All@@ -209,10 +187,24 @@ spec:
value: '{{ "{{" }}workflow.parameters.scanner-image-tag{{ "}}" }}'
- name: SCANNER_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-image-tag{{ "}}" }}'
- name: COLLECTOR_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-slim-image-tag{{ "}}" }}'
- name: SCANNER_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-slim-image-tag{{ "}}" }}'
- name: SCANNER_DB_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-slim-image-tag{{ "}}" }}'
- name: COLLECTOR_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-image-tag{{ "}}" }}'
- name: CENTRAL_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.central-db-image-tag{{ "}}" }}'
- name: SCANNER_V4_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-image-tag{{ "}}" }}'
- name: SCANNER_V4_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-db-image-tag{{ "}}" }}'
- name: FACT_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.fact-image-tag{{ "}}" }}'
- name: CENTRAL_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
- name: SECURED_CLUSTER_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
- name: ANSIBLE_STDOUT_CALLBACK
value: debug
volumeMounts:
Expand All@@ -236,6 +228,7 @@ spec:
artifacts:
- name: admin-password
path: /data/admin_password
optional: true
archive:
none: {}
- name: kubeconfig
Expand DownExpand Up@@ -280,7 +273,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
imagePullPolicy: Always
command:
- entrypoint.sh
Expand All@@ -299,36 +292,3 @@ spec:
- name: data
mountPath: /data

- name: roxctl-central
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-central
path: /tmp/roxctl-central
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-central

- name: roxctl-secured-cluster-services
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-secured-cluster-services
path: /tmp/roxctl-secured-cluster-services
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-secured-cluster-services
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' ROX-35433: Replace Helm install with roxie in openshift-4-demo by vladbologa · Pull Request #1903 · stackrox/infra · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion chart/infra-server/Chart.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ sources:
- https://github.com/stackrox/infra
annotations:
acsDemoVersion: 4.11.2
automationFlavorsVersion: 0.15.5
automationFlavorsVersion: 0.16.0-2-g65a204651e-snapshot
ocpCredentialsMode: Passthrough
dependencies:
- name: argo-workflows
Expand Down
64 changes: 48 additions & 16 deletions chart/infra-server/static/flavors.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -379,18 +379,16 @@
value: example1

- name: central-services-helm-chart-version
description: Central Services Helm chart version
description: Central Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Central Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Central Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: secured-cluster-services-helm-chart-version
description: Secured Cluster Services Helm chart version
description: Secured Cluster Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Secured Cluster Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Secured Cluster Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: openshift-version
description: openshift release from OCP, OCP dev preview, or OKD
Expand DownExpand Up@@ -421,45 +419,79 @@
value: ""
kind: optional
help: |
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Default will be
derived from the Helm chart. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Defaults to
quay.io/stackrox-io. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
quay.io/rhacs-eng and all publicly accessible images.

- name: main-image-tag
description: Main container image tag
value: ""
kind: optional
help: |
Version string of the main container image tag. Default will be derived from the Helm chart.
Version string of the main container image tag.

- name: scanner-image-tag
description: Scanner container image tag
value: ""
kind: optional
help: |
Version string of the scanner container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner container image tag.

- name: scanner-db-image-tag
description: Scanner DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-db container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db container image tag.

- name: scanner-slim-image-tag
description: Scanner Slim container image tag
value: ""
kind: optional
help: |
Version string of the scanner-slim container image tag.

- name: collector-slim-image-tag
description: Collector Slim container image tag
- name: scanner-db-slim-image-tag
description: Scanner DB Slim container image tag
value: ""
kind: optional
help: |
Version string of the collector-slim container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db-slim container image tag.

- name: collector-image-tag
description: Collector container image tag
value: ""
kind: optional
help: |
Version string of the collector container image tag.

- name: central-db-image-tag
description: Central DB container image tag
value: ""
kind: optional
help: |
Version string of the central-db container image tag to use. Setting this value will enable central-db.
Default will be derived from the Helm chart.
Version string of the central-db container image tag.

- name: scanner-v4-image-tag
description: Scanner V4 container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4 container image tag.

- name: scanner-v4-db-image-tag
description: Scanner V4 DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4-db container image tag.

- name: fact-image-tag
description: Fact container image tag
value: ""
kind: optional
help: |
Version string of the fact container image tag.

- name: trusted-certs-enabled
description: Should trusted certificates be created
Expand Down
90 changes: 25 additions & 65 deletions chart/infra-server/static/workflow-openshift-4-demo.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,13 @@ spec:
- name: main-image-tag
- name: scanner-image-tag
- name: scanner-db-image-tag
- name: collector-slim-image-tag
- name: scanner-slim-image-tag
- name: scanner-db-slim-image-tag
- name: collector-image-tag
- name: central-db-image-tag
- name: scanner-v4-image-tag
- name: scanner-v4-db-image-tag
- name: fact-image-tag
- name: central-services-helm-chart-version
- name: secured-cluster-services-helm-chart-version
- name: trusted-certs-enabled
Expand DownExpand Up@@ -53,27 +58,14 @@ spec:
- - name: pre-install
template: pre-install

- - name: roxctl-central
template: roxctl-central

- - name: roxctl-secured-cluster-services
template: roxctl-secured-cluster-services

- - name: run-ansible-demo
template: run-ansible-demo
continueOn:
failed: true
arguments:
parameters:
- name: admin-password
value: '{{ "{{" }}steps.pre-install.outputs.parameters.admin-password{{ "}}" }}'
- name: kubeconfig-base64
value: '{{ "{{" }}steps.pre-install.outputs.parameters.kubeconfig-base64{{ "}}" }}'
artifacts:
- name: roxctl-central
from: '{{ "{{" }}steps.roxctl-central.outputs.artifacts.roxctl-central{{ "}}" }}'
- name: roxctl-secured-cluster-services
from: '{{ "{{" }}steps.roxctl-secured-cluster-services.outputs.artifacts.roxctl-secured-cluster-services{{ "}}" }}'

- - name: gather
template: gather
Expand All@@ -88,7 +80,7 @@ spec:

- name: create
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs to be reverted before merging.

Suggested change
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}

imagePullPolicy: Always
volumeMounts:
- name: data
Expand DownExpand Up@@ -147,30 +139,20 @@ spec:
mountPath: /data
command: [sh]
source: |
openssl rand -base64 32 | tr "+/" "_#" | cut -c 1-20 > /data/admin_password
base64 /data/auth/kubeconfig | tr -d "\n" > /data/auth/kubeconfig_base64
subdomain=apps.{{ "{{" }}workflow.parameters.name{{ "}}" }}.ocp.infra.rox.systems
echo "https://console-openshift-console.${subdomain}" > /data/url-openshift
echo "https://central-stackrox.${subdomain}" > /data/url-stackrox
outputs:
parameters:
- name: admin-password
valueFrom:
path: /data/admin_password
- name: kubeconfig-base64
valueFrom:
path: /data/auth/kubeconfig_base64

- name: run-ansible-demo
inputs:
parameters:
- name: admin-password
- name: kubeconfig-base64
artifacts:
- name: roxctl-central
path: /usr/bin/roxctl-central
- name: roxctl-secured-cluster-services
path: /usr/bin/roxctl-secured-cluster-services
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
Expand All@@ -195,10 +177,6 @@ spec:
key: google-credentials.json
- name: CENTRAL_PORT
value: "443"
- name: ORCHESTRATOR
value: openshift
- name: ADMIN_PASSWORD
value: '{{ "{{" }}inputs.parameters.admin-password{{ "}}" }}'
- name: KUBECONFIG_BASE64
value: '{{ "{{" }}inputs.parameters.kubeconfig-base64{{ "}}" }}'
- name: IMAGE_REGISTRY
Expand All@@ -209,10 +187,24 @@ spec:
value: '{{ "{{" }}workflow.parameters.scanner-image-tag{{ "}}" }}'
- name: SCANNER_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-image-tag{{ "}}" }}'
- name: COLLECTOR_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-slim-image-tag{{ "}}" }}'
- name: SCANNER_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-slim-image-tag{{ "}}" }}'
- name: SCANNER_DB_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-slim-image-tag{{ "}}" }}'
- name: COLLECTOR_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-image-tag{{ "}}" }}'
- name: CENTRAL_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.central-db-image-tag{{ "}}" }}'
- name: SCANNER_V4_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-image-tag{{ "}}" }}'
- name: SCANNER_V4_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-db-image-tag{{ "}}" }}'
- name: FACT_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.fact-image-tag{{ "}}" }}'
- name: CENTRAL_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
- name: SECURED_CLUSTER_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
- name: ANSIBLE_STDOUT_CALLBACK
value: debug
volumeMounts:
Expand All@@ -236,6 +228,7 @@ spec:
artifacts:
- name: admin-password
path: /data/admin_password
optional: true
archive:
none: {}
- name: kubeconfig
Expand DownExpand Up@@ -280,7 +273,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
imagePullPolicy: Always
command:
- entrypoint.sh
Expand All@@ -299,36 +292,3 @@ spec:
- name: data
mountPath: /data

- name: roxctl-central
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-central
path: /tmp/roxctl-central
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-central

- name: roxctl-secured-cluster-services
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-secured-cluster-services
path: /tmp/roxctl-secured-cluster-services
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-secured-cluster-services
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ROX-35433: Replace Helm install with roxie in openshift-4-demo by vladbologa · Pull Request #1903 · stackrox/infra · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion chart/infra-server/Chart.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ sources:
- https://github.com/stackrox/infra
annotations:
acsDemoVersion: 4.11.2
automationFlavorsVersion: 0.15.5
automationFlavorsVersion: 0.16.0-2-g65a204651e-snapshot
ocpCredentialsMode: Passthrough
dependencies:
- name: argo-workflows
Expand Down
64 changes: 48 additions & 16 deletions chart/infra-server/static/flavors.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -379,18 +379,16 @@
value: example1

- name: central-services-helm-chart-version
description: Central Services Helm chart version
description: Central Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Central Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Central Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: secured-cluster-services-helm-chart-version
description: Secured Cluster Services Helm chart version
description: Secured Cluster Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Secured Cluster Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Secured Cluster Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: openshift-version
description: openshift release from OCP, OCP dev preview, or OKD
Expand DownExpand Up@@ -421,45 +419,79 @@
value: ""
kind: optional
help: |
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Default will be
derived from the Helm chart. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Defaults to
quay.io/stackrox-io. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
quay.io/rhacs-eng and all publicly accessible images.

- name: main-image-tag
description: Main container image tag
value: ""
kind: optional
help: |
Version string of the main container image tag. Default will be derived from the Helm chart.
Version string of the main container image tag.

- name: scanner-image-tag
description: Scanner container image tag
value: ""
kind: optional
help: |
Version string of the scanner container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner container image tag.

- name: scanner-db-image-tag
description: Scanner DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-db container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db container image tag.

- name: scanner-slim-image-tag
description: Scanner Slim container image tag
value: ""
kind: optional
help: |
Version string of the scanner-slim container image tag.

- name: collector-slim-image-tag
description: Collector Slim container image tag
- name: scanner-db-slim-image-tag
description: Scanner DB Slim container image tag
value: ""
kind: optional
help: |
Version string of the collector-slim container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db-slim container image tag.

- name: collector-image-tag
description: Collector container image tag
value: ""
kind: optional
help: |
Version string of the collector container image tag.

- name: central-db-image-tag
description: Central DB container image tag
value: ""
kind: optional
help: |
Version string of the central-db container image tag to use. Setting this value will enable central-db.
Default will be derived from the Helm chart.
Version string of the central-db container image tag.

- name: scanner-v4-image-tag
description: Scanner V4 container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4 container image tag.

- name: scanner-v4-db-image-tag
description: Scanner V4 DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4-db container image tag.

- name: fact-image-tag
description: Fact container image tag
value: ""
kind: optional
help: |
Version string of the fact container image tag.

- name: trusted-certs-enabled
description: Should trusted certificates be created
Expand Down
90 changes: 25 additions & 65 deletions chart/infra-server/static/workflow-openshift-4-demo.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,13 @@ spec:
- name: main-image-tag
- name: scanner-image-tag
- name: scanner-db-image-tag
- name: collector-slim-image-tag
- name: scanner-slim-image-tag
- name: scanner-db-slim-image-tag
- name: collector-image-tag
- name: central-db-image-tag
- name: scanner-v4-image-tag
- name: scanner-v4-db-image-tag
- name: fact-image-tag
- name: central-services-helm-chart-version
- name: secured-cluster-services-helm-chart-version
- name: trusted-certs-enabled
Expand DownExpand Up@@ -53,27 +58,14 @@ spec:
- - name: pre-install
template: pre-install

- - name: roxctl-central
template: roxctl-central

- - name: roxctl-secured-cluster-services
template: roxctl-secured-cluster-services

- - name: run-ansible-demo
template: run-ansible-demo
continueOn:
failed: true
arguments:
parameters:
- name: admin-password
value: '{{ "{{" }}steps.pre-install.outputs.parameters.admin-password{{ "}}" }}'
- name: kubeconfig-base64
value: '{{ "{{" }}steps.pre-install.outputs.parameters.kubeconfig-base64{{ "}}" }}'
artifacts:
- name: roxctl-central
from: '{{ "{{" }}steps.roxctl-central.outputs.artifacts.roxctl-central{{ "}}" }}'
- name: roxctl-secured-cluster-services
from: '{{ "{{" }}steps.roxctl-secured-cluster-services.outputs.artifacts.roxctl-secured-cluster-services{{ "}}" }}'

- - name: gather
template: gather
Expand All@@ -88,7 +80,7 @@ spec:

- name: create
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs to be reverted before merging.

Suggested change
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}

imagePullPolicy: Always
volumeMounts:
- name: data
Expand DownExpand Up@@ -147,30 +139,20 @@ spec:
mountPath: /data
command: [sh]
source: |
openssl rand -base64 32 | tr "+/" "_#" | cut -c 1-20 > /data/admin_password
base64 /data/auth/kubeconfig | tr -d "\n" > /data/auth/kubeconfig_base64
subdomain=apps.{{ "{{" }}workflow.parameters.name{{ "}}" }}.ocp.infra.rox.systems
echo "https://console-openshift-console.${subdomain}" > /data/url-openshift
echo "https://central-stackrox.${subdomain}" > /data/url-stackrox
outputs:
parameters:
- name: admin-password
valueFrom:
path: /data/admin_password
- name: kubeconfig-base64
valueFrom:
path: /data/auth/kubeconfig_base64

- name: run-ansible-demo
inputs:
parameters:
- name: admin-password
- name: kubeconfig-base64
artifacts:
- name: roxctl-central
path: /usr/bin/roxctl-central
- name: roxctl-secured-cluster-services
path: /usr/bin/roxctl-secured-cluster-services
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
Expand All@@ -195,10 +177,6 @@ spec:
key: google-credentials.json
- name: CENTRAL_PORT
value: "443"
- name: ORCHESTRATOR
value: openshift
- name: ADMIN_PASSWORD
value: '{{ "{{" }}inputs.parameters.admin-password{{ "}}" }}'
- name: KUBECONFIG_BASE64
value: '{{ "{{" }}inputs.parameters.kubeconfig-base64{{ "}}" }}'
- name: IMAGE_REGISTRY
Expand All@@ -209,10 +187,24 @@ spec:
value: '{{ "{{" }}workflow.parameters.scanner-image-tag{{ "}}" }}'
- name: SCANNER_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-image-tag{{ "}}" }}'
- name: COLLECTOR_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-slim-image-tag{{ "}}" }}'
- name: SCANNER_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-slim-image-tag{{ "}}" }}'
- name: SCANNER_DB_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-slim-image-tag{{ "}}" }}'
- name: COLLECTOR_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-image-tag{{ "}}" }}'
- name: CENTRAL_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.central-db-image-tag{{ "}}" }}'
- name: SCANNER_V4_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-image-tag{{ "}}" }}'
- name: SCANNER_V4_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-db-image-tag{{ "}}" }}'
- name: FACT_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.fact-image-tag{{ "}}" }}'
- name: CENTRAL_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
- name: SECURED_CLUSTER_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
- name: ANSIBLE_STDOUT_CALLBACK
value: debug
volumeMounts:
Expand All@@ -236,6 +228,7 @@ spec:
artifacts:
- name: admin-password
path: /data/admin_password
optional: true
archive:
none: {}
- name: kubeconfig
Expand DownExpand Up@@ -280,7 +273,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
imagePullPolicy: Always
command:
- entrypoint.sh
Expand All@@ -299,36 +292,3 @@ spec:
- name: data
mountPath: /data

- name: roxctl-central
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-central
path: /tmp/roxctl-central
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-central

- name: roxctl-secured-cluster-services
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-secured-cluster-services
path: /tmp/roxctl-secured-cluster-services
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-secured-cluster-services
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); ROX-35433: Replace Helm install with roxie in openshift-4-demo by vladbologa · Pull Request #1903 · stackrox/infra · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion chart/infra-server/Chart.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ sources:
- https://github.com/stackrox/infra
annotations:
acsDemoVersion: 4.11.2
automationFlavorsVersion: 0.15.5
automationFlavorsVersion: 0.16.0-2-g65a204651e-snapshot
ocpCredentialsMode: Passthrough
dependencies:
- name: argo-workflows
Expand Down
64 changes: 48 additions & 16 deletions chart/infra-server/static/flavors.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -379,18 +379,16 @@
value: example1

- name: central-services-helm-chart-version
description: Central Services Helm chart version
description: Central Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Central Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Central Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: secured-cluster-services-helm-chart-version
description: Secured Cluster Services Helm chart version
description: Secured Cluster Services version
value: {{ .Chart.Annotations.acsDemoVersion }}
kind: optional
help: |
Version string of the roxctl version to use to generate Secured Cluster Services Helm chart, e.g., {{ .Chart.Annotations.acsDemoVersion }}.
ACS version to deploy for Secured Cluster Services, e.g., {{ .Chart.Annotations.acsDemoVersion }}.

- name: openshift-version
description: openshift release from OCP, OCP dev preview, or OKD
Expand DownExpand Up@@ -421,45 +419,79 @@
value: ""
kind: optional
help: |
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Default will be
derived from the Helm chart. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
URI of the image registry to use for pulling the ACS container images, e.g., quay.io/rhacs-eng. Defaults to
quay.io/stackrox-io. Note that the default image pull secret is QUAY_RHACS_ENG_RO, which has access to
quay.io/rhacs-eng and all publicly accessible images.

- name: main-image-tag
description: Main container image tag
value: ""
kind: optional
help: |
Version string of the main container image tag. Default will be derived from the Helm chart.
Version string of the main container image tag.

- name: scanner-image-tag
description: Scanner container image tag
value: ""
kind: optional
help: |
Version string of the scanner container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner container image tag.

- name: scanner-db-image-tag
description: Scanner DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-db container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db container image tag.

- name: scanner-slim-image-tag
description: Scanner Slim container image tag
value: ""
kind: optional
help: |
Version string of the scanner-slim container image tag.

- name: collector-slim-image-tag
description: Collector Slim container image tag
- name: scanner-db-slim-image-tag
description: Scanner DB Slim container image tag
value: ""
kind: optional
help: |
Version string of the collector-slim container image tag to use. Default will be derived from the Helm chart.
Version string of the scanner-db-slim container image tag.

- name: collector-image-tag
description: Collector container image tag
value: ""
kind: optional
help: |
Version string of the collector container image tag.

- name: central-db-image-tag
description: Central DB container image tag
value: ""
kind: optional
help: |
Version string of the central-db container image tag to use. Setting this value will enable central-db.
Default will be derived from the Helm chart.
Version string of the central-db container image tag.

- name: scanner-v4-image-tag
description: Scanner V4 container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4 container image tag.

- name: scanner-v4-db-image-tag
description: Scanner V4 DB container image tag
value: ""
kind: optional
help: |
Version string of the scanner-v4-db container image tag.

- name: fact-image-tag
description: Fact container image tag
value: ""
kind: optional
help: |
Version string of the fact container image tag.

- name: trusted-certs-enabled
description: Should trusted certificates be created
Expand Down
90 changes: 25 additions & 65 deletions chart/infra-server/static/workflow-openshift-4-demo.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,13 @@ spec:
- name: main-image-tag
- name: scanner-image-tag
- name: scanner-db-image-tag
- name: collector-slim-image-tag
- name: scanner-slim-image-tag
- name: scanner-db-slim-image-tag
- name: collector-image-tag
- name: central-db-image-tag
- name: scanner-v4-image-tag
- name: scanner-v4-db-image-tag
- name: fact-image-tag
- name: central-services-helm-chart-version
- name: secured-cluster-services-helm-chart-version
- name: trusted-certs-enabled
Expand DownExpand Up@@ -53,27 +58,14 @@ spec:
- - name: pre-install
template: pre-install

- - name: roxctl-central
template: roxctl-central

- - name: roxctl-secured-cluster-services
template: roxctl-secured-cluster-services

- - name: run-ansible-demo
template: run-ansible-demo
continueOn:
failed: true
arguments:
parameters:
- name: admin-password
value: '{{ "{{" }}steps.pre-install.outputs.parameters.admin-password{{ "}}" }}'
- name: kubeconfig-base64
value: '{{ "{{" }}steps.pre-install.outputs.parameters.kubeconfig-base64{{ "}}" }}'
artifacts:
- name: roxctl-central
from: '{{ "{{" }}steps.roxctl-central.outputs.artifacts.roxctl-central{{ "}}" }}'
- name: roxctl-secured-cluster-services
from: '{{ "{{" }}steps.roxctl-secured-cluster-services.outputs.artifacts.roxctl-secured-cluster-services{{ "}}" }}'

- - name: gather
template: gather
Expand All@@ -88,7 +80,7 @@ spec:

- name: create
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs to be reverted before merging.

Suggested change
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}

imagePullPolicy: Always
volumeMounts:
- name: data
Expand DownExpand Up@@ -147,30 +139,20 @@ spec:
mountPath: /data
command: [sh]
source: |
openssl rand -base64 32 | tr "+/" "_#" | cut -c 1-20 > /data/admin_password
base64 /data/auth/kubeconfig | tr -d "\n" > /data/auth/kubeconfig_base64
subdomain=apps.{{ "{{" }}workflow.parameters.name{{ "}}" }}.ocp.infra.rox.systems
echo "https://console-openshift-console.${subdomain}" > /data/url-openshift
echo "https://central-stackrox.${subdomain}" > /data/url-stackrox
outputs:
parameters:
- name: admin-password
valueFrom:
path: /data/admin_password
- name: kubeconfig-base64
valueFrom:
path: /data/auth/kubeconfig_base64

- name: run-ansible-demo
inputs:
parameters:
- name: admin-password
- name: kubeconfig-base64
artifacts:
- name: roxctl-central
path: /usr/bin/roxctl-central
- name: roxctl-secured-cluster-services
path: /usr/bin/roxctl-secured-cluster-services
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
imagePullPolicy: Always
Expand All@@ -195,10 +177,6 @@ spec:
key: google-credentials.json
- name: CENTRAL_PORT
value: "443"
- name: ORCHESTRATOR
value: openshift
- name: ADMIN_PASSWORD
value: '{{ "{{" }}inputs.parameters.admin-password{{ "}}" }}'
- name: KUBECONFIG_BASE64
value: '{{ "{{" }}inputs.parameters.kubeconfig-base64{{ "}}" }}'
- name: IMAGE_REGISTRY
Expand All@@ -209,10 +187,24 @@ spec:
value: '{{ "{{" }}workflow.parameters.scanner-image-tag{{ "}}" }}'
- name: SCANNER_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-image-tag{{ "}}" }}'
- name: COLLECTOR_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-slim-image-tag{{ "}}" }}'
- name: SCANNER_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-slim-image-tag{{ "}}" }}'
- name: SCANNER_DB_SLIM_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-db-slim-image-tag{{ "}}" }}'
- name: COLLECTOR_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.collector-image-tag{{ "}}" }}'
- name: CENTRAL_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.central-db-image-tag{{ "}}" }}'
- name: SCANNER_V4_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-image-tag{{ "}}" }}'
- name: SCANNER_V4_DB_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.scanner-v4-db-image-tag{{ "}}" }}'
- name: FACT_IMAGE_TAG
value: '{{ "{{" }}workflow.parameters.fact-image-tag{{ "}}" }}'
- name: CENTRAL_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
- name: SECURED_CLUSTER_SERVICES_VERSION
value: '{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
- name: ANSIBLE_STDOUT_CALLBACK
value: debug
volumeMounts:
Expand All@@ -236,6 +228,7 @@ spec:
artifacts:
- name: admin-password
path: /data/admin_password
optional: true
archive:
none: {}
- name: kubeconfig
Expand DownExpand Up@@ -280,7 +273,7 @@ spec:

- name: destroy
container:
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }}
image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.15.5
imagePullPolicy: Always
command:
- entrypoint.sh
Expand All@@ -299,36 +292,3 @@ spec:
- name: data
mountPath: /data

- name: roxctl-central
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-central
path: /tmp/roxctl-central
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-central

- name: roxctl-secured-cluster-services
activeDeadlineSeconds: 600
outputs:
artifacts:
- name: roxctl-secured-cluster-services
path: /tmp/roxctl-secured-cluster-services
container:
image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}'
imagePullPolicy: Always
command:
- cp
args:
- --dereference
- -v
- /stackrox/roxctl
- /tmp/roxctl-secured-cluster-services
Loading