Skip to content

Commit a6215c6

Browse files
authored
Merge pull request #7990 from liggitt/groupified
Groupify OAuth and User objects
2 parents 5313b8e + dea9484 commit a6215c6

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

architecture/additional_concepts/authentication.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ To register additional clients:
172172
----
173173
$ oc create -f <(echo '
174174
kind: OAuthClient
175-
apiVersion: v1
175+
apiVersion: oauth.openshift.io/v1
176176
metadata:
177177
name: demo <1>
178178
secret: "..." <2>

architecture/additional_concepts/other_api_objects.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ The following `*OAuthClient*` objects are automatically created:
8989
----
9090
kind: "OAuthClient"
9191
accessTokenMaxAgeSeconds: null <1>
92-
apiVersion: "v1"
92+
apiVersion: "oauth.openshift.io/v1"
9393
metadata:
9494
name: "openshift-web-console" <2>
9595
selflink: "/oapi/v1/oAuthClients/openshift-web-console"
@@ -138,7 +138,7 @@ authorization request to the `*OAuth*` server.
138138
[source,yaml]
139139
----
140140
kind: "OAuthClientAuthorization"
141-
apiVersion: "v1"
141+
apiVersion: "oauth.openshift.io/v1"
142142
metadata:
143143
name: "bob:openshift-web-console"
144144
resourceVersion: "1"
@@ -167,7 +167,7 @@ https://tools.ietf.org/html/rfc6749#section-4.1.3[RFC 6749, section 4.1.3].
167167
[source,yaml]
168168
----
169169
kind: "OAuthAuthorizeToken"
170-
apiVersion: "v1"
170+
apiVersion: "oauth.openshift.io/v1"
171171
metadata:
172172
name: "MDAwYjM5YjMtMzM1MC00NDY4LTkxODItOTA2OTE2YzE0M2Fj" <1>
173173
resourceVersion: "1"
@@ -208,7 +208,7 @@ Access tokens are used as bearer tokens to authenticate to the API.
208208
[source,yaml]
209209
----
210210
kind: "OAuthAccessToken"
211-
apiVersion: "v1"
211+
apiVersion: "oauth.openshift.io/v1"
212212
metadata:
213213
name: "ODliOGE5ZmMtYzczYi00Nzk1LTg4MGEtNzQyZmUxZmUwY2Vh" <1>
214214
resourceVersion: "1"
@@ -273,7 +273,7 @@ given an `*OAuthAccessToken*` for the mapped `*User*`.
273273
[source,yaml]
274274
----
275275
kind: "Identity"
276-
apiVersion: "v1"
276+
apiVersion: "user.openshift.io/v1"
277277
metadata:
278278
name: "anypassword:bob" <1>
279279
uid: "9316ebad-0fde-11e5-97a1-3c970e4b7ffe"
@@ -315,7 +315,7 @@ API.
315315
[source,yaml]
316316
----
317317
kind: "User"
318-
apiVersion: "v1"
318+
apiVersion: "user.openshift.io/v1"
319319
metadata:
320320
name: "bob" <1>
321321
uid: "9311ac33-0fde-11e5-97a1-3c970e4b7ffe"
@@ -347,7 +347,7 @@ methods to identify the same `*User*`.
347347
[source,yaml]
348348
----
349349
kind: "UserIdentityMapping"
350-
apiVersion: "v1"
350+
apiVersion: "user.openshift.io/v1"
351351
metadata:
352352
name: "anypassword:bob" <1>
353353
uid: "9316ebad-0fde-11e5-97a1-3c970e4b7ffe"
@@ -378,7 +378,7 @@ endif::[]
378378
[source,yaml]
379379
----
380380
kind: "Group"
381-
apiVersion: "v1"
381+
apiVersion: "user.openshift.io/v1"
382382
metadata:
383383
name: "developers" <1>
384384
creationTimestamp: "2015-01-01T01:01:01-00:00"

dev_guide/service_accounts.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ $ curl --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
154154
-H "Authorization: Bearer $TOKEN"
155155
156156
kind: "User"
157-
apiVersion: "v1"
157+
apiVersion: "user.openshift.io/v1"
158158
metadata:
159159
name: "system:serviceaccount:top-secret:robot"
160160
selflink: "/oapi/v1/users/system:serviceaccount:top-secret:robot"

install_config/syncing_groups_with_ldap.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ operation:
375375
====
376376
[source,yaml]
377377
----
378-
apiVersion: v1
378+
apiVersion: user.openshift.io/v1
379379
kind: Group
380380
metadata:
381381
annotations:
@@ -456,7 +456,7 @@ operation:
456456
====
457457
[source,yaml]
458458
----
459-
apiVersion: v1
459+
apiVersion: user.openshift.io/v1
460460
kind: Group
461461
metadata:
462462
annotations:
@@ -607,7 +607,7 @@ operation:
607607
====
608608
[source,yaml]
609609
----
610-
apiVersion: v1
610+
apiVersion: user.openshift.io/v1
611611
kind: Group
612612
metadata:
613613
annotations:
@@ -713,7 +713,7 @@ operation:
713713
====
714714
[source,yaml]
715715
----
716-
apiVersion: v1
716+
apiVersion: user.openshift.io/v1
717717
kind: Group
718718
metadata:
719719
annotations:
@@ -846,7 +846,7 @@ operation:
846846
====
847847
[source,yaml]
848848
----
849-
apiVersion: v1
849+
apiVersion: user.openshift.io/v1
850850
kind: Group
851851
metadata:
852852
annotations:
@@ -1021,7 +1021,7 @@ operation:
10211021
.OpenShift Group Created Using *_augmented_active_directory_config_nested.yaml_*
10221022
[source,yaml]
10231023
----
1024-
apiVersion: v1
1024+
apiVersion: user.openshift.io/v1
10251025
kind: Group
10261026
metadata:
10271027
annotations:

0 commit comments

Comments
 (0)