зеркало из https://github.com/Azure/ARO-RP.git
remove samples repoistory dep
This commit is contained in:
Mangirdas Judeikis
Родитель
1698946865
Коммит
abf0a438e2
|
|
@ -938,7 +938,7 @@
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
branch = "release-4.4"
|
branch = "release-4.4"
|
||||||
digest = "1:9881a7758b2afa3ffdc0503f6e32ac63d7369a4c4c1747278baf62729b09d241"
|
digest = "1:dfa5f5b132f57a26ba1007bcc5dc1ec1230a043507d2c2ec7d1d9c05edf58151"
|
||||||
name = "github.com/openshift/client-go"
|
name = "github.com/openshift/client-go"
|
||||||
packages = [
|
packages = [
|
||||||
"config/clientset/versioned",
|
"config/clientset/versioned",
|
||||||
|
|
@ -953,6 +953,9 @@
|
||||||
"operator/clientset/versioned/typed/operator/v1/fake",
|
"operator/clientset/versioned/typed/operator/v1/fake",
|
||||||
"operator/clientset/versioned/typed/operator/v1alpha1",
|
"operator/clientset/versioned/typed/operator/v1alpha1",
|
||||||
"operator/clientset/versioned/typed/operator/v1alpha1/fake",
|
"operator/clientset/versioned/typed/operator/v1alpha1/fake",
|
||||||
|
"samples/clientset/versioned",
|
||||||
|
"samples/clientset/versioned/scheme",
|
||||||
|
"samples/clientset/versioned/typed/samples/v1",
|
||||||
"security/clientset/versioned",
|
"security/clientset/versioned",
|
||||||
"security/clientset/versioned/scheme",
|
"security/clientset/versioned/scheme",
|
||||||
"security/clientset/versioned/typed/security/v1",
|
"security/clientset/versioned/typed/security/v1",
|
||||||
|
|
@ -1022,18 +1025,6 @@
|
||||||
pruneopts = "UT"
|
pruneopts = "UT"
|
||||||
revision = "2336783d460353458477aa9e181eca87e4db5d27"
|
revision = "2336783d460353458477aa9e181eca87e4db5d27"
|
||||||
|
|
||||||
[[projects]]
|
|
||||||
branch = "release-4.3"
|
|
||||||
digest = "1:900bceaa6cc77aab2ec6088d9b298e7e54df69a5794afcf9e1ab8452f56c8409"
|
|
||||||
name = "github.com/openshift/cluster-samples-operator"
|
|
||||||
packages = [
|
|
||||||
"pkg/generated/clientset/versioned",
|
|
||||||
"pkg/generated/clientset/versioned/scheme",
|
|
||||||
"pkg/generated/clientset/versioned/typed/samples/v1",
|
|
||||||
]
|
|
||||||
pruneopts = "UT"
|
|
||||||
revision = "bfda4d3462fd7305573adb103137723d2bd4975c"
|
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
branch = "release-4.3"
|
branch = "release-4.3"
|
||||||
digest = "1:4221f7b123b05d8ece2b79a3cd6891e3a421c8b2f2e6f2ab8abe3be0f7ef0fee"
|
digest = "1:4221f7b123b05d8ece2b79a3cd6891e3a421c8b2f2e6f2ab8abe3be0f7ef0fee"
|
||||||
|
|
@ -2024,12 +2015,12 @@
|
||||||
"github.com/openshift/client-go/config/clientset/versioned/scheme",
|
"github.com/openshift/client-go/config/clientset/versioned/scheme",
|
||||||
"github.com/openshift/client-go/operator/clientset/versioned",
|
"github.com/openshift/client-go/operator/clientset/versioned",
|
||||||
"github.com/openshift/client-go/operator/clientset/versioned/fake",
|
"github.com/openshift/client-go/operator/clientset/versioned/fake",
|
||||||
|
"github.com/openshift/client-go/samples/clientset/versioned",
|
||||||
"github.com/openshift/client-go/security/clientset/versioned",
|
"github.com/openshift/client-go/security/clientset/versioned",
|
||||||
"github.com/openshift/cluster-api-provider-azure/pkg/apis/azureprovider/v1beta1",
|
"github.com/openshift/cluster-api-provider-azure/pkg/apis/azureprovider/v1beta1",
|
||||||
"github.com/openshift/cluster-api/pkg/apis/machine/v1beta1",
|
"github.com/openshift/cluster-api/pkg/apis/machine/v1beta1",
|
||||||
"github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset",
|
"github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset",
|
||||||
"github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset/fake",
|
"github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset/fake",
|
||||||
"github.com/openshift/cluster-samples-operator/pkg/generated/clientset/versioned",
|
|
||||||
"github.com/openshift/console-operator/pkg/api",
|
"github.com/openshift/console-operator/pkg/api",
|
||||||
"github.com/openshift/installer/data",
|
"github.com/openshift/installer/data",
|
||||||
"github.com/openshift/installer/pkg/asset",
|
"github.com/openshift/installer/pkg/asset",
|
||||||
|
|
|
||||||
|
|
@ -42,10 +42,6 @@ required = [
|
||||||
name = "github.com/openshift/cluster-api"
|
name = "github.com/openshift/cluster-api"
|
||||||
branch = "release-4.3"
|
branch = "release-4.3"
|
||||||
|
|
||||||
[[override]]
|
|
||||||
name = "github.com/openshift/cluster-samples-operator"
|
|
||||||
branch = "release-4.3"
|
|
||||||
|
|
||||||
[[constraint]]
|
[[constraint]]
|
||||||
name = "github.com/openshift/cluster-api-provider-azure"
|
name = "github.com/openshift/cluster-api-provider-azure"
|
||||||
branch = "release-4.3"
|
branch = "release-4.3"
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,8 @@ import (
|
||||||
"github.com/Azure/go-autorest/autorest/date"
|
"github.com/Azure/go-autorest/autorest/date"
|
||||||
configclient "github.com/openshift/client-go/config/clientset/versioned"
|
configclient "github.com/openshift/client-go/config/clientset/versioned"
|
||||||
operatorclient "github.com/openshift/client-go/operator/clientset/versioned"
|
operatorclient "github.com/openshift/client-go/operator/clientset/versioned"
|
||||||
|
samplesclient "github.com/openshift/client-go/samples/clientset/versioned"
|
||||||
securityclient "github.com/openshift/client-go/security/clientset/versioned"
|
securityclient "github.com/openshift/client-go/security/clientset/versioned"
|
||||||
samplesclient "github.com/openshift/cluster-samples-operator/pkg/generated/clientset/versioned"
|
|
||||||
"github.com/openshift/installer/pkg/asset/ignition/bootstrap"
|
"github.com/openshift/installer/pkg/asset/ignition/bootstrap"
|
||||||
"github.com/openshift/installer/pkg/asset/installconfig"
|
"github.com/openshift/installer/pkg/asset/installconfig"
|
||||||
"github.com/openshift/installer/pkg/asset/releaseimage"
|
"github.com/openshift/installer/pkg/asset/releaseimage"
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ package versioned
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
samplesv1 "github.com/openshift/cluster-samples-operator/pkg/generated/clientset/versioned/typed/samples/v1"
|
samplesv1 "github.com/openshift/client-go/samples/clientset/versioned/typed/samples/v1"
|
||||||
discovery "k8s.io/client-go/discovery"
|
discovery "k8s.io/client-go/discovery"
|
||||||
rest "k8s.io/client-go/rest"
|
rest "k8s.io/client-go/rest"
|
||||||
flowcontrol "k8s.io/client-go/util/flowcontrol"
|
flowcontrol "k8s.io/client-go/util/flowcontrol"
|
||||||
|
|
@ -6,7 +6,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
v1 "github.com/openshift/api/samples/v1"
|
v1 "github.com/openshift/api/samples/v1"
|
||||||
scheme "github.com/openshift/cluster-samples-operator/pkg/generated/clientset/versioned/scheme"
|
scheme "github.com/openshift/client-go/samples/clientset/versioned/scheme"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
types "k8s.io/apimachinery/pkg/types"
|
types "k8s.io/apimachinery/pkg/types"
|
||||||
watch "k8s.io/apimachinery/pkg/watch"
|
watch "k8s.io/apimachinery/pkg/watch"
|
||||||
|
|
@ -4,7 +4,7 @@ package v1
|
||||||
|
|
||||||
import (
|
import (
|
||||||
v1 "github.com/openshift/api/samples/v1"
|
v1 "github.com/openshift/api/samples/v1"
|
||||||
"github.com/openshift/cluster-samples-operator/pkg/generated/clientset/versioned/scheme"
|
"github.com/openshift/client-go/samples/clientset/versioned/scheme"
|
||||||
rest "k8s.io/client-go/rest"
|
rest "k8s.io/client-go/rest"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -1,686 +0,0 @@
|
||||||
{
|
|
||||||
"apiVersion": "v1",
|
|
||||||
"kind": "Template",
|
|
||||||
"labels": {
|
|
||||||
"template": "eap72-third-party-db-s2i",
|
|
||||||
"xpaas": "1.1.0"
|
|
||||||
},
|
|
||||||
"message": "A new EAP based application with SSL support has been created in your project. Please be sure to create the following secrets:\"${CONFIGURATION_NAME}\" containing the datasource configuration details required by the deployed application(s); \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
|
|
||||||
"metadata": {
|
|
||||||
"annotations": {
|
|
||||||
"description": "An example Red Hat JBoss EAP 7 application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap72/README.adoc.",
|
|
||||||
"iconClass": "icon-eap",
|
|
||||||
"openshift.io/display-name": "JBoss EAP 7.2 (with passthrough TLS, DB drivers)",
|
|
||||||
"openshift.io/provider-display-name": "Red Hat, Inc.",
|
|
||||||
"tags": "eap,javaee,java,jboss",
|
|
||||||
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/",
|
|
||||||
"template.openshift.io/long-description": "This template defines resources needed to develop a Red Hat JBoss Enterprise Application Server 7.2 based application, including a build configuration, application deployment configuration, using third-party DB drivers and secure communication using passthrough TLS.",
|
|
||||||
"template.openshift.io/support-url": "https://access.redhat.com",
|
|
||||||
"version": "1.1.0"
|
|
||||||
},
|
|
||||||
"name": "eap72-third-party-db-s2i"
|
|
||||||
},
|
|
||||||
"objects": [
|
|
||||||
{
|
|
||||||
"apiVersion": "v1",
|
|
||||||
"kind": "Service",
|
|
||||||
"metadata": {
|
|
||||||
"annotations": {
|
|
||||||
"description": "The web server's http port."
|
|
||||||
},
|
|
||||||
"labels": {
|
|
||||||
"application": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"name": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"spec": {
|
|
||||||
"ports": [
|
|
||||||
{
|
|
||||||
"port": 8080,
|
|
||||||
"targetPort": 8080
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"selector": {
|
|
||||||
"deploymentConfig": "${APPLICATION_NAME}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"apiVersion": "v1",
|
|
||||||
"kind": "Service",
|
|
||||||
"metadata": {
|
|
||||||
"annotations": {
|
|
||||||
"description": "The web server's https port."
|
|
||||||
},
|
|
||||||
"labels": {
|
|
||||||
"application": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"name": "secure-${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"spec": {
|
|
||||||
"ports": [
|
|
||||||
{
|
|
||||||
"port": 8443,
|
|
||||||
"targetPort": 8443
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"selector": {
|
|
||||||
"deploymentConfig": "${APPLICATION_NAME}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"apiVersion": "v1",
|
|
||||||
"kind": "Service",
|
|
||||||
"metadata": {
|
|
||||||
"annotations": {
|
|
||||||
"description": "The JGroups ping port for clustering.",
|
|
||||||
"service.alpha.kubernetes.io/tolerate-unready-endpoints": "true"
|
|
||||||
},
|
|
||||||
"labels": {
|
|
||||||
"application": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"name": "${APPLICATION_NAME}-ping"
|
|
||||||
},
|
|
||||||
"spec": {
|
|
||||||
"clusterIP": "None",
|
|
||||||
"ports": [
|
|
||||||
{
|
|
||||||
"name": "ping",
|
|
||||||
"port": 8888
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"publishNotReadyAddresses": true,
|
|
||||||
"selector": {
|
|
||||||
"deploymentConfig": "${APPLICATION_NAME}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"apiVersion": "v1",
|
|
||||||
"id": "${APPLICATION_NAME}-http",
|
|
||||||
"kind": "Route",
|
|
||||||
"metadata": {
|
|
||||||
"annotations": {
|
|
||||||
"description": "Route for application's http service."
|
|
||||||
},
|
|
||||||
"labels": {
|
|
||||||
"application": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"name": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"spec": {
|
|
||||||
"to": {
|
|
||||||
"name": "${APPLICATION_NAME}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"apiVersion": "v1",
|
|
||||||
"id": "${APPLICATION_NAME}-https",
|
|
||||||
"kind": "Route",
|
|
||||||
"metadata": {
|
|
||||||
"annotations": {
|
|
||||||
"description": "Route for application's https service."
|
|
||||||
},
|
|
||||||
"labels": {
|
|
||||||
"application": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"name": "secure-${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"spec": {
|
|
||||||
"host": "${HOSTNAME_HTTPS}",
|
|
||||||
"tls": {
|
|
||||||
"termination": "passthrough"
|
|
||||||
},
|
|
||||||
"to": {
|
|
||||||
"name": "secure-${APPLICATION_NAME}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"apiVersion": "v1",
|
|
||||||
"kind": "ImageStream",
|
|
||||||
"metadata": {
|
|
||||||
"labels": {
|
|
||||||
"application": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"name": "${APPLICATION_NAME}"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"apiVersion": "v1",
|
|
||||||
"kind": "BuildConfig",
|
|
||||||
"metadata": {
|
|
||||||
"labels": {
|
|
||||||
"application": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"name": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"spec": {
|
|
||||||
"output": {
|
|
||||||
"to": {
|
|
||||||
"kind": "ImageStreamTag",
|
|
||||||
"name": "${APPLICATION_NAME}:latest"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"source": {
|
|
||||||
"contextDir": "${CONTEXT_DIR}",
|
|
||||||
"git": {
|
|
||||||
"ref": "${SOURCE_REPOSITORY_REF}",
|
|
||||||
"uri": "${SOURCE_REPOSITORY_URL}"
|
|
||||||
},
|
|
||||||
"images": [
|
|
||||||
{
|
|
||||||
"from": {
|
|
||||||
"kind": "ImageStreamTag",
|
|
||||||
"name": "${EXTENSIONS_IMAGE}",
|
|
||||||
"namespace": "${EXTENSIONS_IMAGE_NAMESPACE}"
|
|
||||||
},
|
|
||||||
"paths": [
|
|
||||||
{
|
|
||||||
"destinationDir": "./${CONTEXT_DIR}/extensions/extras",
|
|
||||||
"sourcePath": "${EXTENSIONS_INSTALL_DIR}/."
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"type": "Git"
|
|
||||||
},
|
|
||||||
"strategy": {
|
|
||||||
"sourceStrategy": {
|
|
||||||
"env": [
|
|
||||||
{
|
|
||||||
"name": "MAVEN_MIRROR_URL",
|
|
||||||
"value": "${MAVEN_MIRROR_URL}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "MAVEN_ARGS_APPEND",
|
|
||||||
"value": "${MAVEN_ARGS_APPEND}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "CUSTOM_INSTALL_DIRECTORIES",
|
|
||||||
"value": "extensions/*"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "ARTIFACT_DIR",
|
|
||||||
"value": "${ARTIFACT_DIR}"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"forcePull": true,
|
|
||||||
"from": {
|
|
||||||
"kind": "ImageStreamTag",
|
|
||||||
"name": "jboss-eap72-openshift:1.1",
|
|
||||||
"namespace": "${IMAGE_STREAM_NAMESPACE}"
|
|
||||||
},
|
|
||||||
"incremental": true
|
|
||||||
},
|
|
||||||
"type": "Source"
|
|
||||||
},
|
|
||||||
"triggers": [
|
|
||||||
{
|
|
||||||
"github": {
|
|
||||||
"secret": "${GITHUB_WEBHOOK_SECRET}"
|
|
||||||
},
|
|
||||||
"type": "GitHub"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"generic": {
|
|
||||||
"secret": "${GENERIC_WEBHOOK_SECRET}"
|
|
||||||
},
|
|
||||||
"type": "Generic"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"imageChange": {},
|
|
||||||
"type": "ImageChange"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"imageChange": {
|
|
||||||
"from": {
|
|
||||||
"kind": "ImageStreamTag",
|
|
||||||
"name": "${EXTENSIONS_IMAGE}",
|
|
||||||
"namespace": "${EXTENSIONS_IMAGE_NAMESPACE}"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"type": "ImageChange"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "ConfigChange"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"apiVersion": "v1",
|
|
||||||
"kind": "DeploymentConfig",
|
|
||||||
"metadata": {
|
|
||||||
"labels": {
|
|
||||||
"application": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"name": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"spec": {
|
|
||||||
"replicas": 1,
|
|
||||||
"selector": {
|
|
||||||
"deploymentConfig": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"strategy": {
|
|
||||||
"type": "Recreate"
|
|
||||||
},
|
|
||||||
"template": {
|
|
||||||
"metadata": {
|
|
||||||
"labels": {
|
|
||||||
"application": "${APPLICATION_NAME}",
|
|
||||||
"deploymentConfig": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"name": "${APPLICATION_NAME}"
|
|
||||||
},
|
|
||||||
"spec": {
|
|
||||||
"containers": [
|
|
||||||
{
|
|
||||||
"env": [
|
|
||||||
{
|
|
||||||
"name": "JGROUPS_PING_PROTOCOL",
|
|
||||||
"value": "dns.DNS_PING"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
|
|
||||||
"value": "${APPLICATION_NAME}-ping"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "OPENSHIFT_DNS_PING_SERVICE_PORT",
|
|
||||||
"value": "8888"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "ENV_FILES",
|
|
||||||
"value": "/etc/eap-environment/*"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "HTTPS_KEYSTORE_DIR",
|
|
||||||
"value": "/etc/eap-secret-volume"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "HTTPS_KEYSTORE",
|
|
||||||
"value": "${HTTPS_KEYSTORE}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "HTTPS_KEYSTORE_TYPE",
|
|
||||||
"value": "${HTTPS_KEYSTORE_TYPE}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "HTTPS_NAME",
|
|
||||||
"value": "${HTTPS_NAME}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "HTTPS_PASSWORD",
|
|
||||||
"value": "${HTTPS_PASSWORD}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "MQ_CLUSTER_PASSWORD",
|
|
||||||
"value": "${MQ_CLUSTER_PASSWORD}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "MQ_QUEUES",
|
|
||||||
"value": "${MQ_QUEUES}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "MQ_TOPICS",
|
|
||||||
"value": "${MQ_TOPICS}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "JGROUPS_ENCRYPT_SECRET",
|
|
||||||
"value": "${JGROUPS_ENCRYPT_SECRET}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "JGROUPS_ENCRYPT_KEYSTORE_DIR",
|
|
||||||
"value": "/etc/jgroups-encrypt-secret-volume"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "JGROUPS_ENCRYPT_KEYSTORE",
|
|
||||||
"value": "${JGROUPS_ENCRYPT_KEYSTORE}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "JGROUPS_ENCRYPT_NAME",
|
|
||||||
"value": "${JGROUPS_ENCRYPT_NAME}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "JGROUPS_ENCRYPT_PASSWORD",
|
|
||||||
"value": "${JGROUPS_ENCRYPT_PASSWORD}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "JGROUPS_CLUSTER_PASSWORD",
|
|
||||||
"value": "${JGROUPS_CLUSTER_PASSWORD}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "AUTO_DEPLOY_EXPLODED",
|
|
||||||
"value": "${AUTO_DEPLOY_EXPLODED}"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"image": "${APPLICATION_NAME}",
|
|
||||||
"imagePullPolicy": "Always",
|
|
||||||
"livenessProbe": {
|
|
||||||
"exec": {
|
|
||||||
"command": [
|
|
||||||
"/bin/bash",
|
|
||||||
"-c",
|
|
||||||
"/opt/eap/bin/livenessProbe.sh"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"initialDelaySeconds": 60
|
|
||||||
},
|
|
||||||
"name": "${APPLICATION_NAME}",
|
|
||||||
"ports": [
|
|
||||||
{
|
|
||||||
"containerPort": 8778,
|
|
||||||
"name": "jolokia",
|
|
||||||
"protocol": "TCP"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"containerPort": 8080,
|
|
||||||
"name": "http",
|
|
||||||
"protocol": "TCP"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"containerPort": 8443,
|
|
||||||
"name": "https",
|
|
||||||
"protocol": "TCP"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"containerPort": 8888,
|
|
||||||
"name": "ping",
|
|
||||||
"protocol": "TCP"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"readinessProbe": {
|
|
||||||
"exec": {
|
|
||||||
"command": [
|
|
||||||
"/bin/bash",
|
|
||||||
"-c",
|
|
||||||
"/opt/eap/bin/readinessProbe.sh false"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"initialDelaySeconds": 10
|
|
||||||
},
|
|
||||||
"resources": {
|
|
||||||
"limits": {
|
|
||||||
"memory": "${MEMORY_LIMIT}"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"volumeMounts": [
|
|
||||||
{
|
|
||||||
"mountPath": "/etc/eap-environment",
|
|
||||||
"name": "configuration",
|
|
||||||
"readOnly": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"mountPath": "/etc/eap-secret-volume",
|
|
||||||
"name": "eap-keystore-volume",
|
|
||||||
"readOnly": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"mountPath": "/etc/jgroups-encrypt-secret-volume",
|
|
||||||
"name": "eap-jgroups-keystore-volume",
|
|
||||||
"readOnly": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"terminationGracePeriodSeconds": 75,
|
|
||||||
"volumes": [
|
|
||||||
{
|
|
||||||
"name": "configuration",
|
|
||||||
"secret": {
|
|
||||||
"secretName": "${CONFIGURATION_NAME}"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "eap-keystore-volume",
|
|
||||||
"secret": {
|
|
||||||
"secretName": "${HTTPS_SECRET}"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "eap-jgroups-keystore-volume",
|
|
||||||
"secret": {
|
|
||||||
"secretName": "${JGROUPS_ENCRYPT_SECRET}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"triggers": [
|
|
||||||
{
|
|
||||||
"imageChangeParams": {
|
|
||||||
"automatic": true,
|
|
||||||
"containerNames": [
|
|
||||||
"${APPLICATION_NAME}"
|
|
||||||
],
|
|
||||||
"from": {
|
|
||||||
"kind": "ImageStreamTag",
|
|
||||||
"name": "${APPLICATION_NAME}:latest"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"type": "ImageChange"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "ConfigChange"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"parameters": [
|
|
||||||
{
|
|
||||||
"description": "The name for the application.",
|
|
||||||
"displayName": "Application Name",
|
|
||||||
"name": "APPLICATION_NAME",
|
|
||||||
"required": true,
|
|
||||||
"value": "eap-app"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "The name of the secret containing configuration properties for the datasources.",
|
|
||||||
"displayName": "Configuration Secret Name",
|
|
||||||
"name": "CONFIGURATION_NAME",
|
|
||||||
"required": true,
|
|
||||||
"value": "eap-app-config"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-<application-name>-<project>.<default-domain-suffix>",
|
|
||||||
"displayName": "Custom https Route Hostname",
|
|
||||||
"name": "HOSTNAME_HTTPS",
|
|
||||||
"required": false,
|
|
||||||
"value": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Git source URI for application",
|
|
||||||
"displayName": "Git Repository URL",
|
|
||||||
"name": "SOURCE_REPOSITORY_URL",
|
|
||||||
"required": true,
|
|
||||||
"value": "https://github.com/jboss-openshift/openshift-quickstarts"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Git branch/tag reference",
|
|
||||||
"displayName": "Git Reference",
|
|
||||||
"name": "SOURCE_REPOSITORY_REF",
|
|
||||||
"required": false,
|
|
||||||
"value": "1.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Path within Git project to build; empty for root project directory.",
|
|
||||||
"displayName": "Context Directory",
|
|
||||||
"name": "CONTEXT_DIR",
|
|
||||||
"required": false,
|
|
||||||
"value": "datavirt/hibernate-webapp"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "ImageStreamTag definition for the image containing the drivers and configuration, e.g. jboss-datavirt63-driver-openshift:1.1",
|
|
||||||
"displayName": "Drivers ImageStreamTag",
|
|
||||||
"name": "EXTENSIONS_IMAGE",
|
|
||||||
"required": true,
|
|
||||||
"value": "jboss-datavirt63-driver-openshift:1.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Namespace within which the ImageStream definition for the image containing the drivers and configuration is located.",
|
|
||||||
"displayName": "Drivers ImageStream Namespace",
|
|
||||||
"name": "EXTENSIONS_IMAGE_NAMESPACE",
|
|
||||||
"required": true,
|
|
||||||
"value": "openshift"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Full path to the directory within the extensions image where the extensions are located (e.g. install.sh, modules/, etc.)",
|
|
||||||
"displayName": "Drivers Image Install Directory",
|
|
||||||
"name": "EXTENSIONS_INSTALL_DIR",
|
|
||||||
"required": true,
|
|
||||||
"value": "/extensions"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Queue names, separated by commas. These queues will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all queues used by the application *must* be specified here in order to be created automatically on the remote AMQ broker.",
|
|
||||||
"displayName": "Queue Names",
|
|
||||||
"name": "MQ_QUEUES",
|
|
||||||
"required": false,
|
|
||||||
"value": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Topic names, separated by commas. These topics will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all topics used by the application *must* be specified here in order to be created automatically on the remote AMQ broker.",
|
|
||||||
"displayName": "Topic Names",
|
|
||||||
"name": "MQ_TOPICS",
|
|
||||||
"required": false,
|
|
||||||
"value": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "The name of the secret containing the keystore file",
|
|
||||||
"displayName": "Server Keystore Secret Name",
|
|
||||||
"name": "HTTPS_SECRET",
|
|
||||||
"required": true,
|
|
||||||
"value": "eap-app-secret"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "The name of the keystore file within the secret",
|
|
||||||
"displayName": "Server Keystore Filename",
|
|
||||||
"name": "HTTPS_KEYSTORE",
|
|
||||||
"required": false,
|
|
||||||
"value": "keystore.jks"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "The type of the keystore file (JKS or JCEKS)",
|
|
||||||
"displayName": "Server Keystore Type",
|
|
||||||
"name": "HTTPS_KEYSTORE_TYPE",
|
|
||||||
"required": false,
|
|
||||||
"value": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "The name associated with the server certificate",
|
|
||||||
"displayName": "Server Certificate Name",
|
|
||||||
"name": "HTTPS_NAME",
|
|
||||||
"required": false,
|
|
||||||
"value": "jboss"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "The password for the keystore and certificate",
|
|
||||||
"displayName": "Server Keystore Password",
|
|
||||||
"name": "HTTPS_PASSWORD",
|
|
||||||
"required": false,
|
|
||||||
"value": "mykeystorepass"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Admin password for Messaging cluster.",
|
|
||||||
"displayName": "Messaging Cluster Admin Password",
|
|
||||||
"from": "[a-zA-Z0-9]{8}",
|
|
||||||
"generate": "expression",
|
|
||||||
"name": "MQ_CLUSTER_PASSWORD",
|
|
||||||
"required": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "A secret string used to configure the GitHub webhook.",
|
|
||||||
"displayName": "Github Webhook Secret",
|
|
||||||
"from": "[a-zA-Z0-9]{8}",
|
|
||||||
"generate": "expression",
|
|
||||||
"name": "GITHUB_WEBHOOK_SECRET",
|
|
||||||
"required": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "A secret string used to configure the Generic webhook.",
|
|
||||||
"displayName": "Generic Webhook Secret",
|
|
||||||
"from": "[a-zA-Z0-9]{8}",
|
|
||||||
"generate": "expression",
|
|
||||||
"name": "GENERIC_WEBHOOK_SECRET",
|
|
||||||
"required": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.",
|
|
||||||
"displayName": "ImageStream Namespace",
|
|
||||||
"name": "IMAGE_STREAM_NAMESPACE",
|
|
||||||
"required": true,
|
|
||||||
"value": "openshift"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "The name of the secret containing the keystore to be used for securing JGroups communications.",
|
|
||||||
"displayName": "JGroups Secret Name",
|
|
||||||
"name": "JGROUPS_ENCRYPT_SECRET",
|
|
||||||
"required": false,
|
|
||||||
"value": "eap-app-secret"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "The name of the keystore file within the JGroups secret.",
|
|
||||||
"displayName": "JGroups Keystore Filename",
|
|
||||||
"name": "JGROUPS_ENCRYPT_KEYSTORE",
|
|
||||||
"required": false,
|
|
||||||
"value": "jgroups.jceks"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "The name associated with the JGroups server certificate",
|
|
||||||
"displayName": "JGroups Certificate Name",
|
|
||||||
"name": "JGROUPS_ENCRYPT_NAME",
|
|
||||||
"required": false,
|
|
||||||
"value": "secret-key"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "The password for the keystore and certificate",
|
|
||||||
"displayName": "JGroups Keystore Password",
|
|
||||||
"name": "JGROUPS_ENCRYPT_PASSWORD",
|
|
||||||
"required": false,
|
|
||||||
"value": "password"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Password used by JGroups to authenticate nodes in the cluster.",
|
|
||||||
"displayName": "JGroups Cluster Password",
|
|
||||||
"from": "[a-zA-Z0-9]{8}",
|
|
||||||
"generate": "expression",
|
|
||||||
"name": "JGROUPS_CLUSTER_PASSWORD",
|
|
||||||
"required": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Controls whether exploded deployment content should be automatically deployed",
|
|
||||||
"displayName": "Deploy Exploded Archives",
|
|
||||||
"name": "AUTO_DEPLOY_EXPLODED",
|
|
||||||
"required": false,
|
|
||||||
"value": "false"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Maven mirror to use for S2I builds",
|
|
||||||
"displayName": "Maven mirror URL",
|
|
||||||
"name": "MAVEN_MIRROR_URL",
|
|
||||||
"required": false,
|
|
||||||
"value": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Maven additional arguments to use for S2I builds",
|
|
||||||
"displayName": "Maven Additional Arguments",
|
|
||||||
"name": "MAVEN_ARGS_APPEND",
|
|
||||||
"required": false,
|
|
||||||
"value": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied.",
|
|
||||||
"name": "ARTIFACT_DIR",
|
|
||||||
"required": false,
|
|
||||||
"value": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Container memory limit",
|
|
||||||
"name": "MEMORY_LIMIT",
|
|
||||||
"required": false,
|
|
||||||
"value": "1Gi"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Загрузка…
Ссылка в новой задаче