Skip to content

Commit

Permalink
Merge branch 'dev1.0.3' into ReleaseCandidate-1.0.3-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
LewisKSaint authored Apr 23, 2024
2 parents 1aa2bef + 4a0aca7 commit 14bfb6b
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- main

env:
VERSION: 1.0.3-dev
VERSION: 1.0.3
IMAGE_NAME: pubsubplus-eventbroker-operator
VAULT_ADDR: https://vault.maas-vault-prod.solace.cloud:8200
GCLOUD_PROJECT_ID_DEV: stellar-arcadia-205014
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 1.0.3-dev
VERSION ?= 1.0.3

# API_VERSION defines the API version for the PubSubPlusEventBroker CRD
API_VERSION ?= v1beta1
Expand Down
3 changes: 1 addition & 2 deletions config/samples/pubsubpluseventbroker_ha_node_affinity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,5 @@ spec:
monitoring:
enabled: true
image:
repository: ghcr.io/solacedev/pubsubplus-prometheus-exporter@sha256
tag: b0ff45382b20260ea982e8353f1889bed4c6611d812e02ec16e5e5b1702721a7
repository: ghcr.io/solacedev/pubsubplus-prometheus-exporter
pullPolicy: Always
3 changes: 1 addition & 2 deletions config/samples/pubsubpluseventbroker_ha_pod_affinity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,5 @@ spec:
monitoring:
enabled: true
image:
repository: ghcr.io/solacedev/pubsubplus-prometheus-exporter@sha256
tag: b0ff45382b20260ea982e8353f1889bed4c6611d812e02ec16e5e5b1702721a7
repository: ghcr.io/solacedev/pubsubplus-prometheus-exporter
pullPolicy: Always
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,5 @@ spec:
monitoring:
enabled: true
image:
repository: ghcr.io/solacedev/pubsubplus-prometheus-exporter@sha256
tag: b0ff45382b20260ea982e8353f1889bed4c6611d812e02ec16e5e5b1702721a7
repository: ghcr.io/solacedev/pubsubplus-prometheus-exporter
pullPolicy: Always
5 changes: 2 additions & 3 deletions config/samples/pubsubpluseventbroker_scaling_parameters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
type: kubernetes.io/tls
data:
# values are base64 encoded, which obscures them but does NOT provide
# any useful level of confidentiality
# any useful level of confidentiality.
tls.crt: |
LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrVENDQWVHZ0F3SUJBZ0lVZUQ5OEZUakloV0tGVUs0VWgzbWpMRDJUOGlrd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0RERUtNQWdHQTFVRUF3d0JLakFlRncweU5EQXpNVEF4TmpJeE1UbGFGdzB5TlRBek1UQXhOakl4TVRsYQpNQXd4Q2pBSUJnTlZCQU1NQVNvd2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUURCClpiRElyUEt2STJsN3Z6QXFWQXlLTjJybFVSOHd6cG11cHdrWFdZNHRTS1hRK2VPMHBaYnBMY0N3WDRRZlRuZlcKVkxlUElJbnBOcVIzbGxNSloxNmdZbXVrbUdMeTJ0MnpQS1JOM1U2eWNQSHRCM2NVUkZEbjZ1YTlxOGRxcXN6SQpyMmdDaDM0UTlwM1lxeVA0T2FWQVI2b3FaVCszNnA3VGZSUlFTUWdYRDI5RWJyZnI5SUd6M0dTSmtFTjhsNExVCmQ0Ym5ZdGhjNGhvVytsQ0l1TUJpNlRxRitGZ2g5Z3VoNTJVSjFVLy80YkcvN0Y1dDFMZklON21mUnBTQXRSUlcKbHp2TWZMOW4wVyttNHlXQy9EeExnVjkvUXRhQUxnR1ZaVmpYRUF2VkprQk9kUS8yMUNSMDZSZXVaSjcrVExXSgpPS01INVdpQ0c5Z3F1d0lRaGY5akFnTUJBQUdqVXpCUk1CMEdBMVVkRGdRV0JCVEkyN3VJVndkTzVUQnFVNTBMClNyUmM2T291QnpBZkJnTlZIU01FR0RBV2dCVEkyN3VJVndkTzVUQnFVNTBMU3JSYzZPb3VCekFQQmdOVkhSTUIKQWY4RUJUQURBUUgvTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFCTXN0Y0xCL2Q2dXI4U3pTL0xCTWMxTDdoKwpZOURvK25ialh0dTIwZkxBK2FCVVhFSFAyVytBalYyZG1jaFA3d2MrQVZYYWxLLy9EaTBrSGhSdWNIRXBSVXJPCm1iTWNtcDRZK1VRUS9jTTJUVGZKZ1E3MTBDRjlhdTBZeW8weWxuMzNiRE5jWDZjSnJKZUxaWEd6TmxIb2R4WVcKWHlMUTFHSTlDZVJCYjVMYVJQQ0IyZFpkU1N6Sko1MWJYR3VKdXpFWHFKM1pUWkN6ZVo3Q0dsanZUd1d0OGlnSwpZd0Y5NHlyYzEzYkNmK2ZZOEdDbloybG1pOThueVd6WDE0eXNETDhuQUVVano0ZE5pUDdsNUx4R1JVTDNjb2RjCjk1a0MyRGd3SEIxVE5tRW5JMFNWUGk0N21RRk5PZ0JNZFdPVnQ5Z2ZXRDRyODA4K0YvMGxmUXNndTExMgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
# This is an example, remember to not use in production
Expand Down Expand Up @@ -41,6 +41,5 @@ spec:
monitoring:
enabled: true
image:
repository: ghcr.io/solacedev/pubsubplus-prometheus-exporter@sha256
tag: b0ff45382b20260ea982e8353f1889bed4c6611d812e02ec16e5e5b1702721a7
repository: ghcr.io/solacedev/pubsubplus-prometheus-exporter
pullPolicy: Always
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,5 @@ spec:
monitoring:
enabled: true
image:
repository: ghcr.io/solacedev/pubsubplus-prometheus-exporter@sha256
tag: b0ff45382b20260ea982e8353f1889bed4c6611d812e02ec16e5e5b1702721a7
repository: ghcr.io/solacedev/pubsubplus-prometheus-exporter
pullPolicy: Always
75 changes: 65 additions & 10 deletions docs/EventBrokerOperatorParametersReference.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ PubSub+ Event Broker
<td>true</td>
</tr>
<tr>
<td><b><a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta">metadata</a></b></td>
<td><b><a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#objectmeta-v1-meta">metadata</a></b></td>
<td>object</td>
<td>Refer to the Kubernetes API documentation for the fields of the `metadata` field.</td>
<td>true</td>
Expand Down Expand Up @@ -1306,8 +1306,7 @@ null or empty namespaces list and null namespaceSelector means "this pod's names



A label query over a set of resources, in this case pods.
If it's null, this PodAffinityTerm matches with no Pods.
A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods.

<table>
<thead>
Expand Down Expand Up @@ -1570,8 +1569,8 @@ null or empty namespaces list and null namespaceSelector means "this pod's names



A label query over a set of resources, in this case pods.
If it's null, this PodAffinityTerm matches with no Pods.

A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods.

<table>
<thead>
Expand Down Expand Up @@ -1914,8 +1913,8 @@ null or empty namespaces list and null namespaceSelector means "this pod's names



A label query over a set of resources, in this case pods.
If it's null, this PodAffinityTerm matches with no Pods.

A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods.

<table>
<thead>
Expand Down Expand Up @@ -2178,8 +2177,7 @@ null or empty namespaces list and null namespaceSelector means "this pod's names



A label query over a set of resources, in this case pods.
If it's null, this PodAffinityTerm matches with no Pods.
A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods.

<table>
<thead>
Expand Down Expand Up @@ -2409,6 +2407,63 @@ If the operator is Exists, the value should be empty, otherwise just a regular s
</table>


### PubSubPlusEventBroker.spec.nodeAssignment[index].spec.tolerations[index]
<sup><sup>[↩ Parent](#pubsubpluseventbrokerspecnodeassignmentindexspec)</sup></sup>



The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.

<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Description</th>
<th>Required</th>
</tr>
</thead>
<tbody><tr>
<td><b>effect</b></td>
<td>string</td>
<td>
Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>key</b></td>
<td>string</td>
<td>
Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>operator</b></td>
<td>string</td>
<td>
Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>tolerationSeconds</b></td>
<td>integer</td>
<td>
TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.<br/>
<br/>
<i>Format</i>: int64<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>value</b></td>
<td>string</td>
<td>
Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.<br/>
</td>
<td>false</td>
</tr></tbody>
</table>


### PubSubPlusEventBroker.spec.securityContext
<sup><sup>[↩ Parent](#pubsubpluseventbrokerspec)</sup></sup>

Expand Down Expand Up @@ -3082,4 +3137,4 @@ Monitoring sectionprovides monitoring support status
</td>
<td>false</td>
</tr></tbody>
</table>
</table>

0 comments on commit 14bfb6b

Please sign in to comment.