Skip to content

Commit

Permalink
refactor: Move automount location to separate field
Browse files Browse the repository at this point in the history
The automount location used to be an `ipa-client-install` argument.
However the approach has to issues:

1. `ipa-client-install --automount-location` is currently broken and
   wont't get fixed in time for next internal demo, see
   https://pagure.io/freeipa/issue/9487
2. For NFS automount of home directories, the SELinux boolean
   `use_nfs_home_dirs` must be enabled first.

The new API has the automount location in a new field, so
`ipahcc-auto-enrollment` can run `ipa-client-automount` and `setsebool`
after `ipa-client-install`.

IPA's automount location is an RDN attribute,
`cn=name,cn=automount,$SUFFIX`.

Also syncs golang version and oapi-codegen version with backend.

Signed-off-by: Christian Heimes <[email protected]>
  • Loading branch information
tiran authored and frasertweedale committed Nov 29, 2023
1 parent f32b6bf commit d311632
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
oapi_codegen:
runs-on: "ubuntu-latest"
container: registry.access.redhat.com/ubi9/go-toolset:1.18
container: registry.access.redhat.com/ubi9/go-toolset:1.20
steps:
- uses: "actions/checkout@v3"
- run: make oapi-codegen
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ NODE_BIN = node_modules/.bin
BIN = bin
TMP = tmp
OAPI_CODEGEN = $(BIN)/oapi-codegen
OAPI_CODEGEN_VERSION ?= v1.12.4
OAPI_CODEGEN_VERSION ?= v1.14.0

SWAGGER_CONTAINER = swagger-editor

Expand Down
8 changes: 7 additions & 1 deletion public.openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1098,6 +1098,12 @@
],
"additionalProperties": false,
"properties": {
"automount_location": {
"description": "Automount location name for ipa-client-automount",
"type": "string",
"minLength": 1,
"example": "default"
},
"cabundle": {
"$ref": "#/components/schemas/CaCertBundle"
},
Expand All @@ -1115,7 +1121,7 @@
"items": {
"type": "string"
},
"example": "[\"--automount-location=default\", \"--enable-dns-updates\"]"
"example": "[\"--enable-dns-updates\"]"
},
"realm_name": {
"$ref": "#/components/schemas/RealmName"
Expand Down
7 changes: 6 additions & 1 deletion public.openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -776,6 +776,11 @@ components:
- realm_name
additionalProperties: false
properties:
automount_location:
description: Automount location name for ipa-client-automount
type: string
minLength: 1
example: default
cabundle:
$ref: '#/components/schemas/CaCertBundle'
enrollment_servers:
Expand All @@ -789,7 +794,7 @@ components:
type: array
items:
type: string
example: '["--automount-location=default", "--enable-dns-updates"]'
example: '["--enable-dns-updates"]'
realm_name:
$ref: '#/components/schemas/RealmName'
x-rh-ipa-hcc:
Expand Down

0 comments on commit d311632

Please sign in to comment.