Skip to content

Commit

Permalink
Merge pull request #947 from SUSE/appendices
Browse files Browse the repository at this point in the history
Update kubecf appendix. Add back cf-operator appendix
  • Loading branch information
KucharczykL authored Aug 27, 2020
2 parents c612e51 + b85eaff commit 4efd525
Show file tree
Hide file tree
Showing 3 changed files with 178 additions and 39 deletions.
111 changes: 111 additions & 0 deletions xml/app_cf_operator_values_yaml.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE appendix
[
<!ENTITY % entities SYSTEM "entity-decl.ent">
%entities;
]>
<sect1
xml:id="app-cf-operator-values-yaml"
xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink"
version="5.0">
<title>Complete suse/cf-operator values.yaml File</title>

<para>
This is the complete output of <command>helm inspect values suse/cf-operator</command> for
the current &productname; &productnumber; release.
</para>

<screen>## Default values for Cf-operator Helm Chart.
## This is a YAML-formatted file.
## Declare variables to be passed into your templates.


# applyCRD is a boolean to control the installation of CRD's.
applyCRD: true

cluster:
# domain is the the Kubernetes cluster domain
domain: "cluster.local"

# createWatchNamespace is a boolean to control creation of the watched namespace.
createWatchNamespace: true

# fullnameOverride overrides the release name
fullnameOverride: ""

# image is the docker image of quarks job.
image:
# repository that provides the operator docker image.
repository: cf-operator
# org that provides the operator docker image.
org: registry.suse.com/cap
# tag of the operator docker image
tag: v4.5.13-0.gd4738712

# logrotateInterval is the time between logrotate calls for instance groups in minutes
logrotateInterval: 1440

# logLevel defines from which level the logs should be printed (trace,debug,info,warn).
logLevel: debug

# workers are the int values for running maximum number of workers of the respective controller.
workers:
boshdeployment: 1
quarksSecret: 1
quarksStatefulset: 1

operator:
webhook:
# host under which the webhook server can be reached from the cluster
host: ~
# port the webhook server listens on
port: "2999"
# boshDNSDockerImage is the docker image used for emulating bosh DNS (a CoreDNS image).
boshDNSDockerImage: "registry.suse.com/cap/coredns:0.1.0-1.6.7-bp152.1.2"

# nameOverride overrides the chart name part of the release name
nameOverride: ""

# serviceAccount contains the configuration
# values of the service account used by cf-operator.
serviceAccount:
# create is a boolean to control the creation of service account name.
create: true
# name of the service account.
name:

global:
# Context Timeout for each K8's API request in seconds.
contextTimeout: 300
image:
# pullPolicy defines the policy used for pulling docker images.
pullPolicy: IfNotPresent
# credentials is used for pulling docker images.
credentials: ~
# username:
# password:
# servername:
operator:
# watchNamespace is used for watching the BOSH deployments.
watchNamespace: staging
webhook:
# useServiceReference is a boolean to control the use of the
# service reference in the webhook spec instead of a url.
useServiceReference: true

rbac:
# create is a boolean to control the installation of quarks job cluster role template.
create: true

quarks-job:
# createWatchNamespace is a boolean to control creation of the watched namespace.
createWatchNamespace: false
serviceAccount:
# create is a boolean to control the creation of service account name.
create: true
# name of the service account.
name:
</screen>
</sect1>
105 changes: 66 additions & 39 deletions xml/app_kubecf_values_yaml.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
the current &productname; &productnumber; release.
</para>

<screen>
# REQUIRED: the domain that the deployment will be visible to the user.
<screen># REQUIRED: the domain that the deployment will be visible to the user.
system_domain: ~

# Set or override job properties. The first level of the map is the instance group name. The second
Expand Down Expand Up @@ -50,7 +49,7 @@ kube:
releases:
# The defaults for all releases, where we do not otherwise override them.
defaults:
url: docker.io/cfcontainerization
url: registry.suse.com/cap
stemcell:
os: SLE_15_SP1
version: 23.21-7.0.0_374.gb8e8e6af
Expand All @@ -76,7 +75,7 @@ releases:
# pxc is not a BOSH release.
pxc:
image:
repository: docker.io/cfcontainerization/pxc
repository: registry.suse.com/cap/pxc
tag: 0.9.4
eirini:
version: 0.0.27
Expand All @@ -90,70 +89,70 @@ releases:
sync-integration-tests:
version: v0.0.3
suse-staticfile-buildpack:
url: registry.suse.com/cap-staging
version: "1.5.6.1"
url: registry.suse.com/cap
version: "1.5.5.1"
stemcell:
os: SLE_15_SP1
version: 25.1-7.0.0_374.gb8e8e6af
file: suse-staticfile-buildpack/packages/staticfile-buildpack-sle15/staticfile-buildpack-sle15-v1.5.6.1-2.1-a74620df.zip
file: suse-staticfile-buildpack/packages/staticfile-buildpack-sle15/staticfile-buildpack-sle15-v1.5.5.1-5.1-eaf36a02.zip
suse-java-buildpack:
url: registry.suse.com/cap-staging
version: "4.30.0.1"
url: registry.suse.com/cap
version: "4.29.1.1"
stemcell:
os: SLE_15_SP1
version: 25.1-7.0.0_374.gb8e8e6af
file: suse-java-buildpack/packages/java-buildpack-sle15/java-buildpack-v4.30.0.1-3f9ee273.zip
file: suse-java-buildpack/packages/java-buildpack-sle15/java-buildpack-sle15-v4.29.1.1-543ec059.zip
suse-ruby-buildpack:
url: registry.suse.com/cap-staging
url: registry.suse.com/cap
version: "1.8.15.1"
stemcell:
os: SLE_15_SP1
version: 25.1-7.0.0_374.gb8e8e6af
file: suse-ruby-buildpack/packages/ruby-buildpack-sle15/ruby-buildpack-sle15-v1.8.15.1-4.1-2b6d6879.zip
suse-dotnet-core-buildpack:
url: registry.suse.com/cap-staging
url: registry.suse.com/cap
version: "2.3.9.1"
stemcell:
os: SLE_15_SP1
version: 25.1-7.0.0_374.gb8e8e6af
file: suse-dotnet-core-buildpack/packages/dotnet-core-buildpack-sle15/dotnet-core-buildpack-sle15-v2.3.9.1-1.1-e74bd89e.zip
suse-nodejs-buildpack:
url: registry.suse.com/cap-staging
version: "1.7.18.1"
url: registry.suse.com/cap
version: "1.7.17.1"
stemcell:
os: SLE_15_SP1
version: 25.1-7.0.0_374.gb8e8e6af
file: suse-nodejs-buildpack/packages/nodejs-buildpack-sle15/nodejs-buildpack-sle15-v1.7.18.1-1.1-d2f6559e.zip
file: suse-nodejs-buildpack/packages/nodejs-buildpack-sle15/nodejs-buildpack-sle15-v1.7.17.1-1.1-7e96d2dd.zip
suse-go-buildpack:
url: registry.suse.com/cap-staging
version: "1.9.12.1"
url: registry.suse.com/cap
version: "1.9.11.1"
stemcell:
os: SLE_15_SP1
version: 25.1-7.0.0_374.gb8e8e6af
file: suse-go-buildpack/packages/go-buildpack-sle15/go-buildpack-sle15-v1.9.12.1-1.1-b4deef1b.zip
file: suse-go-buildpack/packages/go-buildpack-sle15/go-buildpack-sle15-v1.9.11.1-2.1-d5c02636.zip
suse-python-buildpack:
url: registry.suse.com/cap-staging
version: "1.7.14.1"
url: registry.suse.com/cap
version: "1.7.12.1"
stemcell:
os: SLE_15_SP1
version: 25.2-7.0.0_374.gb8e8e6af
file: suse-python-buildpack/packages/python-buildpack-sle15/python-buildpack-sle15-v1.7.14.1-1.1-a828fa62.zip
version: 25.1-7.0.0_374.gb8e8e6af
file: suse-python-buildpack/packages/python-buildpack-sle15/python-buildpack-sle15-v1.7.12.1-2.1-ebd0f50d.zip
suse-php-buildpack:
url: registry.suse.com/cap-staging
url: registry.suse.com/cap
version: "4.4.12.1"
stemcell:
os: SLE_15_SP1
version: 25.1-7.0.0_374.gb8e8e6af
file: suse-php-buildpack/packages/php-buildpack-sle15/php-buildpack-sle15-v4.4.12.1-4.1-2c4591cb.zip
suse-nginx-buildpack:
url: registry.suse.com/cap-staging
url: registry.suse.com/cap
version: "1.1.7.1"
stemcell:
os: SLE_15_SP1
version: 25.1-7.0.0_374.gb8e8e6af
file: suse-nginx-buildpack/packages/nginx-buildpack-sle15/nginx-buildpack-sle15-v1.1.7.1-1.1-fbf90d1f.zip
suse-binary-buildpack:
url: registry.suse.com/cap-staging
url: registry.suse.com/cap
version: "1.0.36.1"
stemcell:
os: SLE_15_SP1
Expand All @@ -163,8 +162,32 @@ releases:
multi_az: false
high_availability: false

# Sizing takes precedence over the high_availability property. I.e. setting the instance count
# for an instance group greater than 1 will make it highly available.
# Instance sizing takes precedence over the high_availability property. I.e. setting the
# instance count for an instance group greater than 1 will make it highly available.
#
# It is also possible to specify custom affinity rules for each instance group. If no rule
# is provided, then each group as anti-affinity to itself, to try to spread the pods between
# different nodes. In addition diego-cell and router also have anti-affinity to each other.
#
# The default rules look like this:
#
# sizing:
# sample_group:
# affinity:
# podAntiAffinity:
# preferredDuringSchedulingIgnoredDuringExecution:
# - weight: 100
# podAffinityTerm:
# labelSelector:
# matchExpressions:
# - key: quarks.cloudfoundry.org/quarks-statefulset-name
# operator: In
# values:
# - sample_group
# topologyKey: kubernetes.io/hostname
#
# Any affinity rules specified here will *overwrite* the default rule and not merge with it.

sizing:
adapter:
instances: ~
Expand Down Expand Up @@ -257,6 +280,7 @@ settings:

features:
eirini:
# When eirini is enabled, both suse_default_stack and suse_buildpacks must be enabled as well.
enabled: false
registry:
service:
Expand All @@ -269,6 +293,8 @@ features:
key: ~
annotations: {}
labels: {}
suse_default_stack:
enabled: true
suse_buildpacks:
enabled: true
autoscaler:
Expand Down Expand Up @@ -394,15 +420,15 @@ eirini:
loadbalanced: true
opi:
image_tag: "1.5.0"
image: registry.suse.com/cap-staging/opi
metrics_collector_image: registry.suse.com/cap-staging/metrics-collector
bits_waiter_image: registry.suse.com/cap-staging/bits-waiter
route_collector_image: registry.suse.com/cap-staging/route-collector
route_pod_informer_image: registry.suse.com/cap-staging/route-pod-informer
route_statefulset_informer_image: registry.suse.com/cap-staging/route-statefulset-informer
event_reporter_image: registry.suse.com/cap-staging/event-reporter
image: registry.suse.com/cap/opi
metrics_collector_image: registry.suse.com/cap/metrics-collector
bits_waiter_image: registry.suse.com/cap/bits-waiter
route_collector_image: registry.suse.com/cap/route-collector
route_pod_informer_image: registry.suse.com/cap/route-pod-informer
route_statefulset_informer_image: registry.suse.com/cap/route-statefulset-informer
event_reporter_image: registry.suse.com/cap/event-reporter
event_reporter_image_tag: "1.5.0"
staging_reporter_image: registry.suse.com/cap-staging/staging-reporter
staging_reporter_image: registry.suse.com/cap/staging-reporter
staging_reporter_image_tag: "1.5.0"
#
registry_secret_name: eirini-registry-credentials
Expand All @@ -418,11 +444,11 @@ eirini:
serviceName: "api"

staging:
downloader_image: registry.suse.com/cap-staging/recipe-downloader
downloader_image: registry.suse.com/cap/recipe-downloader
downloader_image_tag: "1.5.0-24.1"
executor_image: registry.suse.com/cap-staging/recipe-executor
executor_image: registry.suse.com/cap/recipe-executor
executor_image_tag: "1.5.0-24.1"
uploader_image: registry.suse.com/cap-staging/recipe-uploader
uploader_image: registry.suse.com/cap/recipe-uploader
uploader_image_tag: "1.5.0-24.1"
enable: true
tls:
Expand Down Expand Up @@ -513,7 +539,7 @@ bits:
labels: {}
annotations: {}
images:
bits_service: registry.suse.com/cap-staging/bits-service:bits-1.0.15-15.1.6.2.220-24.2
bits_service: registry.suse.com/cap/bits-service:bits-1.0.15-15.1.6.2.220-24.2
env:
# This setting is not configurable and must be HIDDEN from the user.
DOMAIN: 127.0.0.1.nip.io
Expand Down Expand Up @@ -551,5 +577,6 @@ eirinix:
kube_storage_class: "default"
free: true
default_size: "1Gi"

</screen>
</sect1>
1 change: 1 addition & 0 deletions xml/appendix.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
</dm:docmanager>
</info>
<xi:include href="app_kubecf_values_yaml.xml"/>
<xi:include href="app_cf_operator_values_yaml.xml"/>
</appendix>

0 comments on commit 4efd525

Please sign in to comment.