Skip to content

Commit 0a1986f

Browse files
Add oracle registry secret option (#1035)
Signed-off-by: Arnob Kumar Saha <arnob@appscode.com> Signed-off-by: Samiul <samiul@appscode.com> Co-authored-by: Samiul <samiul@appscode.com>
1 parent a024963 commit 0a1986f

8 files changed

Lines changed: 50 additions & 5 deletions

File tree

apis/wizards/v1alpha1/kubedbcom_oracle_editor_options_types.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ type KubedbcomOracleEditorOptionsSpecSpec struct {
4343
// +optional
4444
Annotations map[string]string `json:"annotations"`
4545
// +optional
46-
Labels map[string]string `json:"labels"`
47-
Mode OracleMode `json:"mode"`
48-
DataGuard *DataGuardSpec `json:"dataGuard,omitempty"`
46+
Labels map[string]string `json:"labels"`
47+
Mode OracleMode `json:"mode"`
48+
DataGuard *DataGuardSpec `json:"dataGuard,omitempty"`
49+
RegistrySecret RegistrySecret `json:"registrySecret"`
4950
// +optional
5051
Replicas int `json:"replicas,omitempty"`
5152
Persistence Persistence `json:"persistence"`
@@ -76,6 +77,10 @@ type DataGuardSpec struct {
7677
Observer *OracleObserver `json:"observer,omitempty"`
7778
}
7879

80+
type RegistrySecret struct {
81+
Name string `json:"name"`
82+
}
83+
7984
// +kubebuilder:validation:Enum=MaximumAvailability;MaximumPerformance;MaximumProtection
8085
type ProtectionMode string
8186

apis/wizards/v1alpha1/zz_generated.deepcopy.go

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/kubedbcom-oracle-editor-options/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ The following table lists the configurable parameters of the `kubedbcom-oracle-e
6666
| spec.dataGuard.protectionMode | | <code>MaximumProtection</code> |
6767
| spec.dataGuard.standbyType | | <code>PHYSICAL</code> |
6868
| spec.dataGuard.syncMode | | <code>SYNC</code> |
69+
| spec.registrySecret.name | | <code>""</code> |
6970
| spec.deletionPolicy | | <code>WipeOut</code> |
7071
| spec.persistence.size | | <code>4Gi</code> |
7172
| spec.podResources.machine | | <code>""</code> |

charts/kubedbcom-oracle-editor-options/templates/db.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ spec:
9999
storageType: Durable
100100
podTemplate:
101101
spec:
102+
{{- if .Values.spec.registrySecret.name }}
103+
imagePullSecrets:
104+
- name: {{ .Values.spec.registrySecret.name }}
105+
{{- end }}
102106
securityContext:
103107
fsGroup: {{ .Values.spec.openshift.securityContext.runAsUser | default 54321 }}
104108
containers:
@@ -129,6 +133,10 @@ spec:
129133
storageType: Durable
130134
podTemplate:
131135
spec:
136+
{{- if .Values.spec.registrySecret.name }}
137+
imagePullSecrets:
138+
- name: {{ .Values.spec.registrySecret.name }}
139+
{{- end }}
132140
securityContext:
133141
fsGroup: {{ .Values.spec.openshift.securityContext.runAsUser | default 54321 }}
134142
containers:

charts/kubedbcom-oracle-editor-options/ui/create-ui.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ step:
9696
type: input
9797
showLabels: true
9898
type: horizontal-layout
99+
- type: select
100+
label: Registry Secret
101+
schema: schema/properties/spec/properties/registrySecret/properties/name
102+
loader: getSecrets
99103
- description: Configure Credentials, Deployment Mode etc.
100104
elements:
101105
- elements:

charts/kubedbcom-oracle-editor-options/values.openapiv3_schema.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,6 +1735,13 @@ properties:
17351735
- machine
17361736
- resources
17371737
type: object
1738+
registrySecret:
1739+
properties:
1740+
name:
1741+
type: string
1742+
required:
1743+
- name
1744+
type: object
17381745
replicas:
17391746
type: integer
17401747
required:
@@ -1747,6 +1754,7 @@ properties:
17471754
- monitoring
17481755
- persistence
17491756
- podResources
1757+
- registrySecret
17501758
type: object
17511759
required:
17521760
- spec

charts/kubedbcom-oracle-editor-options/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ spec:
4242
standbyType: PHYSICAL
4343
syncMode: SYNC
4444

45+
registrySecret:
46+
name: ""
4547
deletionPolicy: WipeOut
4648

4749
persistence:

charts/uikubedbcom-databaseinfo-editor/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ The following table lists the configurable parameters of the `uikubedbcom-databa
4848
| Parameter | Description | Default |
4949
|--------------------|-------------|-------------------------------------|
5050
| apiVersion | | <code>ui.kubedb.com/v1alpha1</code> |
51-
| kind | | <code>DatabaseInfo</code> |
52-
| metadata.name | | <code>databaseinfo</code> |
51+
| kind | | <code>DatabaseConfiguration</code> |
52+
| metadata.name | | <code>databaseconfiguration</code> |
5353
| metadata.namespace | | <code>default</code> |
5454

5555

0 commit comments

Comments
 (0)