Skip to content

Commit cbd53a8

Browse files
authored
Merge pull request #17 from Keyfactor/pan_feedback
Pan feedback 2
2 parents 0de9060 + 8272065 commit cbd53a8

File tree

10 files changed

+936
-245
lines changed

10 files changed

+936
-245
lines changed

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ The secrets that this orchestrator extension supports for use with a PAM Provide
5757
|----------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
5858
| ServerUsername | Must be set to `kubeconfig` if used. If you do not set it to `kubeconfig` the `ServerPassword` will be ignored. |
5959
| ServerPassword | Must be set if `ServerUsername` is provided. The service account credentials for the Universal Orchestrator to use. Must be in `kubeconfig` format. For more information review [Kubernetes service account](https://github.com/Keyfactor/kubernetes-orchestrator/blob/main/scripts/kubernetes/README.md) docs and scripts. |
60-
| KubeSvcCreds | This overrides the `ServerPassword` value. If set, the Universal Orchestrator will use the service account credentials from the specified Kubernetes secret. |
6160

6261

6362
It is not necessary to use a PAM Provider for all of the secrets available above. If a PAM Provider should not be used, simply enter in the actual value to be used, as normal.
@@ -531,11 +530,11 @@ certificate stores and scheduling Discovery jobs in Keyfactor Command.
531530
## Certificate Inventory
532531
In order for certificates to be inventoried by the Keyfactor k8s-orchestrator, they must have specific keys and values in the Kubernetes Secret. The following table shows the required keys and values for each type of certificate store.
533532

534-
| Store Type | Valid Secret Keys |
535-
|------------|-------------------------------------------------------------------------------------|
536-
| K8STLSSecr | `tls.crt`,`tls.key` |
537-
| K8SSecret | `tls.crts`, `cert`, `certs`, `certificate`, `certificates`, `crt`, `crts`, `ca.crt` |
538-
| K8SCert | `cert`, `csr` |
533+
| Store Type | Valid Secret Keys |
534+
|------------|-----------------------------------------------------------------------------------------------|
535+
| K8STLSSecr | `tls.crt`,`tls.key` |
536+
| K8SSecret | `tls.crt`,`tls.crts`, `cert`, `certs`, `certificate`, `certificates`, `crt`, `crts`, `ca.crt` |
537+
| K8SCert | `cert`, `csr` |
539538

540539
## Certificate Management
541540
Management add/remove/create operations will attempt to write back to the Kubernetes Secret.

integration-manifest.json

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,6 @@
8282
"DependsOn": "",
8383
"DefaultValue": "cert",
8484
"Required": true
85-
},
86-
{
87-
"StoreTypeId;omitempty": 0,
88-
"Name": "KubeSvcCreds",
89-
"DisplayName": "KubeSvcCreds",
90-
"Type": "String",
91-
"DependsOn": "",
92-
"DefaultValue": null,
93-
"Required": true
9485
}
9586
],
9687
"EntryParameters": [],
@@ -103,7 +94,7 @@
10394
"StorePathValue": "",
10495
"PrivateKeyAllowed": "Forbidden",
10596
"JobProperties": [],
106-
"ServerRequired": false,
97+
"ServerRequired": true,
10798
"PowerShell": false,
10899
"BlueprintAllowed": false,
109100
"CustomAliasAllowed": "Forbidden"
@@ -147,15 +138,6 @@
147138
"DependsOn": "",
148139
"DefaultValue": "secret",
149140
"Required": true
150-
},
151-
{
152-
"StoreTypeId;omitempty": 0,
153-
"Name": "KubeSvcCreds",
154-
"DisplayName": "KubeSvcCreds",
155-
"Type": "String",
156-
"DependsOn": "",
157-
"DefaultValue": null,
158-
"Required": true
159141
}
160142
],
161143
"EntryParameters": [],
@@ -168,7 +150,7 @@
168150
"StorePathValue": "",
169151
"PrivateKeyAllowed": "Optional",
170152
"JobProperties": [],
171-
"ServerRequired": false,
153+
"ServerRequired": true,
172154
"PowerShell": false,
173155
"BlueprintAllowed": false,
174156
"CustomAliasAllowed": "Forbidden"
@@ -212,15 +194,6 @@
212194
"DependsOn": "",
213195
"DefaultValue": "tls_secret",
214196
"Required": true
215-
},
216-
{
217-
"StoreTypeId;omitempty": 0,
218-
"Name": "KubeSvcCreds",
219-
"DisplayName": "KubeSvcCreds",
220-
"Type": "String",
221-
"DependsOn": "",
222-
"DefaultValue": null,
223-
"Required": true
224197
}
225198
],
226199
"EntryParameters": [],
@@ -233,7 +206,7 @@
233206
"StorePathValue": "",
234207
"PrivateKeyAllowed": "Optional",
235208
"JobProperties": [],
236-
"ServerRequired": false,
209+
"ServerRequired": true,
237210
"PowerShell": false,
238211
"BlueprintAllowed": false,
239212
"CustomAliasAllowed": "Forbidden"

0 commit comments

Comments
 (0)