Skip to content

Commit 8d4a0fc

Browse files
njhalenjhale
authored
Merge branch 'master' into deploy-debug
2 parents bb5a352 + d4b6ca3 commit 8d4a0fc

File tree

11 files changed

+92
-17
lines changed

11 files changed

+92
-17
lines changed

‎Documentation/install/install.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ kubectl create -f deploy/upstream/manifests/latest/
1111
## Install the latest release version of OLM for okd
1212

1313
```bash
14-
oc create namespace operator-lifecycle-manager
1514
oc create -f deploy/okd/manifests/latest/
1615
```
1716

‎deploy/chart/catalog_resources/certified-operators/couchbase.1.0.0.clusterserviceversion.yaml

Lines changed: 72 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
customresourcedefinitions:
1111
owned:
1212
- description: Manages Couchbase clusters
13-
displayName: Couchbase Operator
13+
displayName: Couchbase Cluster
1414
kind: CouchbaseCluster
1515
name: couchbaseclusters.couchbase.com
1616
resources:
@@ -26,6 +26,62 @@ spec:
2626
path: authSecret
2727
x-descriptors:
2828
- 'urn:alm:descriptor:io.kubernetes:Secret'
29+
- description: The name of the secret object that stores the server's TLS certificate.
30+
displayName: Server TLS Secret
31+
path: tls.static.member.serverSecret
32+
x-descriptors:
33+
- 'urn:alm:descriptor:io.kubernetes:Secret'
34+
- description: The name of the secret object that stores the Operator's TLS certificate.
35+
displayName: Operator TLS Secret
36+
path: tls.static.operatorSecret
37+
x-descriptors:
38+
- 'urn:alm:descriptor:io.kubernetes:Secret'
39+
- description: Specifies if the Operator will manage this cluster.
40+
displayName: Paused
41+
path: paused
42+
value: false
43+
x-descriptors:
44+
- 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch'
45+
- description: Specifies if the Couchbase Server Web Console will be exposed externally.
46+
displayName: Expose Console
47+
path: exposeAdminConsole
48+
value: false
49+
x-descriptors:
50+
- 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch'
51+
- description: Specifies whether or not two pods in this cluster can be deployed on the same Kubernetes node.
52+
displayName: Anti Affinity
53+
path: antiAffinity
54+
value: false
55+
x-descriptors:
56+
- 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch'
57+
- description: Specifies if update notifications will be displayed in the Couchbase UI.
58+
displayName: Show Update Notifications
59+
path: softwareUpdateNotifications
60+
value: false
61+
x-descriptors:
62+
- 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch'
63+
- description: Specifies if the Operator will create or delete buckets.
64+
displayName: Disable Bucket Management
65+
path: disableBucketManagement
66+
value: false
67+
x-descriptors:
68+
- 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch'
69+
- description: The desired number of member Pods for the Couchbase cluster.
70+
displayName: Size
71+
path: servers[0].size
72+
x-descriptors:
73+
- 'urn:alm:descriptor:com.tectonic.ui:podCount'
74+
- description: The maximum number of failover events tolerated before manual intervention is required.
75+
displayName: Auto Failover Max Count
76+
path: cluster.autoFailoverMaxCount
77+
x-descriptors:
78+
- 'urn:alm:descriptor:com.tectonic.ui:slider'
79+
- 'urn:alm:descriptor:com.tectonic.ui:sliderStart:1'
80+
- description: Limits describes the minimum/maximum amount of compute resources required/allowed.
81+
displayName: Resource Requirements
82+
path: servers[0].pod.resources
83+
x-descriptors:
84+
- 'urn:alm:descriptor:com.tectonic.ui:resourceRequirements'
2985
statusDescriptors:
3086
- description: The desired number of member Pods for the deployment.
3187
displayName: Size
@@ -46,20 +102,29 @@ spec:
46102
displayName: Member Status
47103
path: members
48104
x-descriptors:
105+
# FIXME: Format doesn't match with what the OpenShift console's donut chart expects
49106
- 'urn:alm:descriptor:com.tectonic.ui:podStatuses'
50107
- description: The current version of the Couchbase cluster.
51108
displayName: Current Version
52109
path: currentVersion
53-
- description: >-
54-
The port the Couchbase Admin Console can be accessed on from any
55-
node in the OpenShift cluster.
110+
- description: The cluster identifier as provided by the Couchbase cluster.
111+
displayName: Cluster ID
112+
path: clusterID
113+
- description: Specifies if the Operator is currently managing this cluster.
114+
displayName: Control Paused
115+
path: controlPaused
116+
- description: The port that the web console can be accessed on from any node in the Kubernetes cluster.
56117
displayName: Admin Console Port
57118
path: adminConsolePort
58-
- description: >-
59-
The SSL port the Couchbase Admin Console can be accessed on from
60-
any node in the OpenShift cluster.
119+
- description: The SSL port that the web console can be accessed on from any node in the Kubernetes cluster.
61120
displayName: SSL Admin Console Port
62121
path: adminConsolePortSSL
122+
- description: Conditions for the cluster
123+
displayName: Conditions
124+
path: conditions
125+
x-descriptors:
126+
# FIXME: Format doesn't match with normal Kubernetes conditions (map vs array)
127+
- 'urn:alm:descriptor:io.kubernetes.conditions'
63128
version: v1
64129
keywords:
65130
- couchbase

‎deploy/chart/templates/0000_30_02-clusterserviceversion.crd.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ spec:
260260
items:
261261
type: string
262262
value:
263+
# FIXME(alecmerdler): Doesn't allow boolean values
263264
type: object
264265
description: If present, the value of this status is the same for all instances of the API resource and can be found here instead of on the API resource.
265266
specDescriptors:

‎deploy/chart/templates/0000_30_13-packageserver.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ spec:
109109
- --watched-namespaces
110110
- {{ .Values.watchedNamespaces }}
111111
{{- end }}
112+
- --secure-port={{ .Values.package.service.internalPort }}
112113
- --global-namespace
113114
- {{ .Values.namespace }}
114115
{{- if .Values.debug }}
@@ -156,6 +157,6 @@ spec:
156157
ports:
157158
- port: 443
158159
protocol: TCP
159-
targetPort: 443
160+
targetPort: {{ .Values.package.service.internalPort }}
160161
selector:
161162
app: package-server

‎deploy/chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ package:
2525
ref: quay.io/coreos/olm:master
2626
pullPolicy: Always
2727
service:
28-
internalPort: 443
28+
internalPort: 5443
2929

3030
catalog_sources:
3131
- rh-operators

‎deploy/ocp/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ package:
2222
ref: quay.io/coreos/olm@sha256:f3b170c8c1cd29c5452afd961e73bada7402623310290926c649cce0b4310470
2323
pullPolicy: Always
2424
service:
25-
internalPort: 443
25+
internalPort: 5443
2626
catalog_sources:
2727
- rh-operators
28-
- certified-operators
28+
- certified-operators

‎deploy/okd/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ package:
2222
ref: quay.io/coreos/olm@sha256:f3b170c8c1cd29c5452afd961e73bada7402623310290926c649cce0b4310470
2323
pullPolicy: Always
2424
service:
25-
internalPort: 443
25+
internalPort: 5443
2626
catalog_sources:
27-
- rh-operators
27+
- rh-operators

‎deploy/upstream/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ package:
2222
ref: quay.io/coreos/olm@sha256:f3b170c8c1cd29c5452afd961e73bada7402623310290926c649cce0b4310470
2323
pullPolicy: Always
2424
service:
25-
internalPort: 443
25+
internalPort: 5443
2626
catalog_sources:
27-
- rh-operators
27+
- rh-operators

‎pkg/package-server/apis/packagemanifest/v1alpha1/packagemanifest.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion) CSVDescr
1111
Name: csv.Spec.Provider.Name,
1212
URL: csv.Spec.Provider.URL,
1313
},
14+
Annotations: csv.GetAnnotations(),
1415
}
1516

1617
icons := make([]Icon, len(csv.Spec.Icon))

‎pkg/package-server/apis/packagemanifest/v1alpha1/packagemanifest_types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ type CSVDescription struct {
9393
Version semver.Version `json:"version,omitempty"`
9494

9595
// Provider is the CSV's provider
96-
Provider AppLink `json:"provider,omitempty"`
96+
Provider AppLink `json:"provider,omitempty"`
97+
Annotations map[string]string `json:"annotations,omitempty"`
9798
}
9899

99100
// AppLink defines a link to an application

0 commit comments

Comments
 (0)