mirror of
https://github.com/ZwareBear/JFrog-Cloud-Installers.git
synced 2026-01-21 01:06:55 -06:00
Openshift pipelines v1.0.1 in marketplace and Xray v1.1.4 in marketplace
This commit is contained in:
@@ -348,6 +348,9 @@ spec:
|
||||
image: "{{ .Values.imageRegistry }}/{{ .Values.pipelines.nexec.image.repository }}:{{ default .Chart.AppVersion .Values.pipelines.version }}"
|
||||
imagePullPolicy: {{ .Values.pipelines.nexec.image.pullPolicy }}
|
||||
workingDir: /opt/jfrog/pipelines/app/micro/nexec
|
||||
securityContext:
|
||||
allowPrivilegeEscalation: false
|
||||
runAsUser: 0
|
||||
env:
|
||||
- name: COMPONENT
|
||||
value: nexec
|
||||
|
||||
@@ -12,26 +12,24 @@ then
|
||||
JOIN_KEY=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
|
||||
fi
|
||||
|
||||
JOIN_KEY=93f1e5d2e8863b3ec14f5cdf136c7896
|
||||
|
||||
helm upgrade --install pipelines . \
|
||||
--set pipelines.pipelines.jfrogUrl=http://openshiftartifactoryha-nginx \
|
||||
--set pipelines.pipelines.jfrogUrlUI=http://openshiftartifactoryha-nginx \
|
||||
--set pipelines.pipelines.jfrogUrl=http://openshiftartifactoryha-artifactory-ha-primary:8082 \
|
||||
--set pipelines.pipelines.jfrogUrlUI=https://johnp.jfrog.tech \
|
||||
--set pipelines.pipelines.masterKey=$MASTER_KEY \
|
||||
--set pipelines.pipelines.joinKey=$JOIN_KEY \
|
||||
--set pipelines.pipelines.accessControlAllowOrigins_0=http://openshiftartifactoryha-nginx \
|
||||
--set pipelines.pipelines.accessControlAllowOrigins_1=http://openshiftartifactoryha-nginx \
|
||||
--set pipelines.pipelines.accessControlAllowOrigins_0=https://johnp.jfrog.tech \
|
||||
--set pipelines.pipelines.accessControlAllowOrigins_1=https://johnp.jfrog.tech \
|
||||
--set pipelines.pipelines.msg.uiUser=monitor \
|
||||
--set pipelines.pipelines.msg.uiUserPassword=monitor \
|
||||
--set pipelines.postgresql.enabled=false \
|
||||
--set pipelines.global.postgresql.host=postgres-postgresql \
|
||||
--set pipelines.global.postgresql.port=5432 \
|
||||
--set pipelines.global.postgresql.database=pipelinesdb \
|
||||
--set pipelines.global.postgresql.database=pipelinedb \
|
||||
--set pipelines.global.postgresql.user=artifactory \
|
||||
--set pipelines.global.postgresql.password=password \
|
||||
--set pipelines.global.postgresql.ssl=false \
|
||||
--set pipelines.rabbitmq.rabbitmq.username=user \
|
||||
--set pipelines.rabbitmq.rabbitmq.password=bitnami \
|
||||
--set pipelines.rabbitmq.externalUrl=amqps://pipelines-rabbit.jfrog.tech \
|
||||
--set pipelines.pipelines.api.externalUrl=http://pipelines-api.jfrog.tech \
|
||||
--set pipelines.pipelines.www.externalUrl=http://pipelines-www.jfrog.tech
|
||||
--set pipelines.rabbitmq.externalUrl=amqp://pipelines-rabbit.jfrog.tech \
|
||||
--set pipelines.pipelines.api.externalUrl=http://pipelines-api.jfrog.tech:30000 \
|
||||
--set pipelines.pipelines.www.externalUrl=http://pipelines-www.jfrog.tech:30001
|
||||
|
||||
@@ -122,7 +122,7 @@ pipelines:
|
||||
|
||||
service:
|
||||
## Supported service types: ClusterIP, NodePort and LoadBalancer
|
||||
type: ClusterIP
|
||||
type: LoadBalancer
|
||||
port: 30000
|
||||
|
||||
annotations:
|
||||
@@ -205,7 +205,7 @@ pipelines:
|
||||
|
||||
service:
|
||||
## Supported service types: ClusterIP, NodePort and LoadBalancer
|
||||
type: ClusterIP
|
||||
type: LoadBalancer
|
||||
port: 30001
|
||||
|
||||
annotations:
|
||||
@@ -957,7 +957,7 @@ pipelines:
|
||||
extraPlugins: ""
|
||||
|
||||
service:
|
||||
type: ClusterIP
|
||||
type: LoadBalancer
|
||||
annotations: {}
|
||||
|
||||
persistence:
|
||||
|
||||
@@ -167,7 +167,7 @@ metadata:
|
||||
capabilities: Seamless Upgrades
|
||||
categories: Developer Tools,Integration & Delivery
|
||||
certified: 'true'
|
||||
containerImage: registry.connect.redhat.com/jfrog/pipelines-operator:1.8.1
|
||||
containerImage: registry.connect.redhat.com/jfrog/pipelines-operator:1.8-1
|
||||
createdAt: 2020-10-09 00:00:00+00:00
|
||||
description: JFrog Pipeline Enterprise deploys Pipeline CI/CD Openshift (Requires Jfrog Artifactory)
|
||||
repository: https://github.com/jfrog/JFrog-Cloud-Installers/tree/openshift4/Openshift4
|
||||
@@ -349,7 +349,7 @@ spec:
|
||||
value: registry.connect.redhat.com/jfrog/pipelines-vault-init:1.8.0
|
||||
- name: RELATED_IMAGE_PIPELINE_VAULT_IMAGE_REPOSITORY
|
||||
value: registry.connect.redhat.com/jfrog/pipelines-vault:1.8.0
|
||||
image: registry.connect.redhat.com/jfrog/pipelines-operator:1.8.1
|
||||
image: registry.connect.redhat.com/jfrog/pipelines-operator:1.8-1
|
||||
imagePullPolicy: Always
|
||||
name: pipeline-operator
|
||||
resources: {}
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
name: openshiftpipelines.charts.helm.k8s.io
|
||||
spec:
|
||||
group: charts.helm.k8s.io
|
||||
names:
|
||||
kind: OpenshiftPipeline
|
||||
listKind: OpenshiftPipelineList
|
||||
plural: openshiftpipelines
|
||||
singular: openshiftpipeline
|
||||
scope: Namespaced
|
||||
subresources:
|
||||
status: {}
|
||||
validation:
|
||||
openAPIV3Schema:
|
||||
type: object
|
||||
version: v1alpha1
|
||||
versions:
|
||||
- name: v1alpha1
|
||||
served: true
|
||||
storage: true
|
||||
status:
|
||||
acceptedNames:
|
||||
kind: ''
|
||||
plural: ''
|
||||
conditions: null
|
||||
storedVersions: null
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,12 @@
|
||||
annotations:
|
||||
operators.operatorframework.io.bundle.channel.default.v1: alpha
|
||||
operators.operatorframework.io.bundle.channels.v1: alpha
|
||||
operators.operatorframework.io.bundle.manifests.v1: manifests/
|
||||
operators.operatorframework.io.bundle.mediatype.v1: registry+v1
|
||||
operators.operatorframework.io.bundle.metadata.v1: metadata/
|
||||
operators.operatorframework.io.bundle.package.v1: openshiftpipeline-operator
|
||||
operators.operatorframework.io.metrics.builder: operator-sdk-v1.0.1
|
||||
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
|
||||
operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1
|
||||
operators.operatorframework.io.test.config.v1: tests/scorecard/
|
||||
operators.operatorframework.io.test.mediatype.v1: scorecard+v1
|
||||
@@ -0,0 +1,5 @@
|
||||
channels:
|
||||
- currentCSV: pipeline-operator.v1.0.1
|
||||
name: alpha
|
||||
defaultChannel: ''
|
||||
packageName: openshiftpipeline-operator
|
||||
@@ -0,0 +1,21 @@
|
||||
kind: Configuration
|
||||
apiversion: scorecard.operatorframework.io/v1alpha3
|
||||
metadata:
|
||||
name: config
|
||||
stages:
|
||||
- parallel: true
|
||||
tests:
|
||||
- image: quay.io/operator-framework/scorecard-test:latest
|
||||
entrypoint:
|
||||
- scorecard-test
|
||||
- basic-check-spec
|
||||
labels:
|
||||
suite: basic
|
||||
test: basic-check-spec-test
|
||||
- image: quay.io/operator-framework/scorecard-test:latest
|
||||
entrypoint:
|
||||
- scorecard-test
|
||||
- olm-bundle-validation
|
||||
labels:
|
||||
suite: olm
|
||||
test: olm-bundle-validation-test
|
||||
@@ -0,0 +1,19 @@
|
||||
FROM scratch
|
||||
|
||||
LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
|
||||
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
|
||||
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
|
||||
LABEL operators.operatorframework.io.bundle.package.v1=openshiftpipeline-operator
|
||||
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
|
||||
LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
|
||||
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.0.1
|
||||
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
|
||||
LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1
|
||||
LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
|
||||
LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
|
||||
|
||||
COPY 1.0.1/manifests /manifests/
|
||||
COPY 1.0.1/metadata /metadata/
|
||||
LABEL com.redhat.openshift.versions="v4.5,v4.6"
|
||||
LABEL com.redhat.delivery.operator.bundle=true
|
||||
LABEL com.redhat.delivery.backport=true
|
||||
@@ -1,5 +1,5 @@
|
||||
channels:
|
||||
- currentCSV: pipeline-operator.v1.1.1
|
||||
- currentCSV: pipeline-operator.v1.0.1
|
||||
name: alpha
|
||||
defaultChannel: ''
|
||||
packageName: openshiftpipeline-operator
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
- version: v1alpha1
|
||||
group: charts.helm.k8s.io
|
||||
kind: OpenshiftPipelines
|
||||
kind: OpenshiftPipeline
|
||||
chart: helm-charts/openshift-pipelines
|
||||
# +kubebuilder:scaffold:watch
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
name: openshiftxrays.charts.helm.k8s.io
|
||||
spec:
|
||||
group: charts.helm.k8s.io
|
||||
names:
|
||||
kind: OpenshiftXray
|
||||
listKind: OpenshiftXrayList
|
||||
plural: openshiftxrays
|
||||
singular: openshiftxray
|
||||
scope: Namespaced
|
||||
subresources:
|
||||
status: {}
|
||||
validation:
|
||||
openAPIV3Schema:
|
||||
type: object
|
||||
version: v1alpha1
|
||||
versions:
|
||||
- name: v1alpha1
|
||||
served: true
|
||||
storage: true
|
||||
status:
|
||||
acceptedNames:
|
||||
kind: ''
|
||||
plural: ''
|
||||
conditions: null
|
||||
storedVersions: null
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,12 @@
|
||||
annotations:
|
||||
operators.operatorframework.io.bundle.channel.default.v1: alpha
|
||||
operators.operatorframework.io.bundle.channels.v1: alpha
|
||||
operators.operatorframework.io.bundle.manifests.v1: manifests/
|
||||
operators.operatorframework.io.bundle.mediatype.v1: registry+v1
|
||||
operators.operatorframework.io.bundle.metadata.v1: metadata/
|
||||
operators.operatorframework.io.bundle.package.v1: openshiftxray-operator
|
||||
operators.operatorframework.io.metrics.builder: operator-sdk-v1.0.1
|
||||
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
|
||||
operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1
|
||||
operators.operatorframework.io.test.config.v1: tests/scorecard/
|
||||
operators.operatorframework.io.test.mediatype.v1: scorecard+v1
|
||||
@@ -0,0 +1,5 @@
|
||||
channels:
|
||||
- currentCSV: xray-operator.v1.1.3
|
||||
name: alpha
|
||||
defaultChannel: ''
|
||||
packageName: openshiftxray-operator
|
||||
@@ -0,0 +1,29 @@
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
name: openshiftxrays.charts.helm.k8s.io
|
||||
spec:
|
||||
group: charts.helm.k8s.io
|
||||
names:
|
||||
kind: OpenshiftXray
|
||||
listKind: OpenshiftXrayList
|
||||
plural: openshiftxrays
|
||||
singular: openshiftxray
|
||||
scope: Namespaced
|
||||
subresources:
|
||||
status: {}
|
||||
validation:
|
||||
openAPIV3Schema:
|
||||
type: object
|
||||
version: v1alpha1
|
||||
versions:
|
||||
- name: v1alpha1
|
||||
served: true
|
||||
storage: true
|
||||
status:
|
||||
acceptedNames:
|
||||
kind: ''
|
||||
plural: ''
|
||||
conditions: null
|
||||
storedVersions: null
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,12 @@
|
||||
annotations:
|
||||
operators.operatorframework.io.bundle.channel.default.v1: alpha
|
||||
operators.operatorframework.io.bundle.channels.v1: alpha
|
||||
operators.operatorframework.io.bundle.manifests.v1: manifests/
|
||||
operators.operatorframework.io.bundle.mediatype.v1: registry+v1
|
||||
operators.operatorframework.io.bundle.metadata.v1: metadata/
|
||||
operators.operatorframework.io.bundle.package.v1: openshiftxray-operator
|
||||
operators.operatorframework.io.metrics.builder: operator-sdk-v1.0.1
|
||||
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
|
||||
operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1
|
||||
operators.operatorframework.io.test.config.v1: tests/scorecard/
|
||||
operators.operatorframework.io.test.mediatype.v1: scorecard+v1
|
||||
@@ -0,0 +1,5 @@
|
||||
channels:
|
||||
- currentCSV: xray-operator.v1.1.4
|
||||
name: alpha
|
||||
defaultChannel: ''
|
||||
packageName: openshiftxray-operator
|
||||
@@ -0,0 +1,19 @@
|
||||
FROM scratch
|
||||
|
||||
LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
|
||||
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
|
||||
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
|
||||
LABEL operators.operatorframework.io.bundle.package.v1=openshiftxray-operator
|
||||
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
|
||||
LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
|
||||
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.0.1
|
||||
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
|
||||
LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1
|
||||
LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
|
||||
LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
|
||||
|
||||
COPY 1.1.3/manifests /manifests/
|
||||
COPY 1.1.3/metadata /metadata/
|
||||
LABEL com.redhat.openshift.versions="v4.5,v4.6"
|
||||
LABEL com.redhat.delivery.operator.bundle=true
|
||||
LABEL com.redhat.delivery.backport=true
|
||||
@@ -0,0 +1,19 @@
|
||||
FROM scratch
|
||||
|
||||
LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
|
||||
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
|
||||
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
|
||||
LABEL operators.operatorframework.io.bundle.package.v1=openshiftxray-operator
|
||||
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
|
||||
LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
|
||||
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.0.1
|
||||
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
|
||||
LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1
|
||||
LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
|
||||
LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
|
||||
|
||||
COPY 1.1.4/manifests /manifests/
|
||||
COPY 1.1.4/metadata /metadata/
|
||||
LABEL com.redhat.openshift.versions="v4.5,v4.6"
|
||||
LABEL com.redhat.delivery.operator.bundle=true
|
||||
LABEL com.redhat.delivery.backport=true
|
||||
@@ -4,7 +4,6 @@
|
||||
kind: OpenshiftXray
|
||||
chart: helm-charts/openshift-xray
|
||||
overrideValues:
|
||||
xray.initContainerImage.override: $RELATED_IMAGE_XRAY_INIT_IMAGE_REPOSITORY
|
||||
xray.server.image.override: $RELATED_IMAGE_XRAY_SERVER_IMAGE_REPOSITORY
|
||||
xray.analysis.image.override: $RELATED_IMAGE_XRAY_ANALYSIS_IMAGE_REPOSITORY
|
||||
xray.persist.image.override: $RELATED_IMAGE_XRAY_PERSIST_IMAGE_REPOSITORY
|
||||
|
||||
Reference in New Issue
Block a user