Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
2174976
azurerm_redhatopenshift_cluster schema definition
fedeoliv Oct 7, 2021
839ba7e
azurerm_redhatopenshift_cluster: random domain name generation
fedeoliv Oct 7, 2021
e2e8728
azurerm_redhatopenshift_cluster: client created
fedeoliv Oct 7, 2021
878c758
azurerm_redhatopenshift_cluster: redhatopenshift vendor
fedeoliv Oct 7, 2021
2830203
azurerm_redhatopenshift_cluster: cluster id parser
fedeoliv Oct 7, 2021
4bfdc70
azurerm_redhatopenshift_cluster: read function
fedeoliv Oct 7, 2021
495f1d6
azurerm_redhatopenshift_cluster: unused methods removed
fedeoliv Oct 7, 2021
b99d883
azurerm_redhatopenshift_cluster: create function
fedeoliv Oct 8, 2021
d425c48
azurerm_redhatopenshift_cluster: enum usage refactor
fedeoliv Oct 8, 2021
053682e
azurerm_redhatopenshift_cluster: update function
fedeoliv Oct 8, 2021
644bf08
azurerm_redhatopenshift_cluster: delete function
fedeoliv Oct 8, 2021
d390606
redhatopenshift services regisration
fedeoliv Oct 8, 2021
bacd12c
redhatopenshift required schema properties updated
fedeoliv Oct 9, 2021
4129d2f
redhatopenshift: initial acceptance tests
fedeoliv Oct 9, 2021
b56b46a
azurerm_redhatopenshift_cluster: node count range validation fixed
fedeoliv Oct 11, 2021
068e0da
azurerm_redhatopenshift_cluster resource documentation
fedeoliv Oct 11, 2021
ac8ba12
azurerm_redhatopenshift_cluster doc description updated
fedeoliv Oct 11, 2021
d3177c9
azurerm_redhatopenshift_cluster: resource_group_id field for cluster_…
fedeoliv Oct 11, 2021
0e493ad
azurerm_redhatopenshift_cluster: cluster openShiftClusters segment parse
fedeoliv Oct 11, 2021
676bf54
azurerm_redhatopenshift_cluster: resource_group_id field read
fedeoliv Oct 11, 2021
e9cd56c
azurerm_redhatopenshift_cluster: console_url output field
fedeoliv Oct 11, 2021
8780018
azurerm_redhatopenshift_cluster: example usage updated
fedeoliv Oct 11, 2021
235d437
examples: basic red hat openshift cluster
fedeoliv Oct 11, 2021
7e01c7e
azurerm_redhatopenshift_cluster: examples reference
fedeoliv Oct 11, 2021
506611e
azurerm_redhatopenshift_cluster: examples reference
fedeoliv Oct 11, 2021
87fa34a
examples: private red hat openshift cluster
fedeoliv Oct 11, 2021
c82a237
examples: red hat openshift cluster with custom domain
fedeoliv Oct 11, 2021
87e1557
azurerm_redhatopenshift_cluster: disk size GB validation
fedeoliv Oct 11, 2021
e29b784
examples: redhatopenshift custom domain updated
fedeoliv Oct 11, 2021
57bb58d
examples: red hat openshift with pull secret from key vault
fedeoliv Oct 11, 2021
d7aae43
azurerm_redhatopenshift_cluster: worker profile name input parameter …
fedeoliv Oct 13, 2021
986dcd7
azurerm_redhatopenshift_cluster: worker profile properties validation
fedeoliv Oct 13, 2021
963206c
fix: worker profile and service principal validations on read operation
fedeoliv Oct 25, 2021
fd61067
azurerm_redhatopenshift_cluster: client_secret read validation
fedeoliv Nov 6, 2021
f703c03
azurerm_redhatopenshift_cluster: worker profile read validation
fedeoliv Nov 10, 2021
798d481
azurerm_redhatopenshift_cluster: worker profile read validation
fedeoliv Nov 10, 2021
d8ff0d9
azurerm_redhatopenshift_cluster: optional parameters updated
fedeoliv Nov 11, 2021
7ce52b7
examples: red hat openshift optional parameters removed
fedeoliv Nov 11, 2021
8683fe5
docs: red hat openshift optional parameters updated
fedeoliv Nov 11, 2021
d5e533a
test: basic red hat openshift cluster
fedeoliv Nov 11, 2021
f009af0
azurerm_redhatopenshift_cluster: visibility validation fix
fedeoliv Nov 11, 2021
ddfa064
azurerm_redhatopenshift_cluster: ingress profile name property removed
fedeoliv Nov 11, 2021
a9e8faa
azurerm_redhatopenshift_cluster: ingress profile read refactor
fedeoliv Nov 11, 2021
987b7ec
test: private red hat openshift cluster
fedeoliv Nov 11, 2021
5a6d3d4
azurerm_redhatopenshift_cluster: cluster profile resource group id pr…
fedeoliv Nov 12, 2021
06d5060
test: red hat openshift cluster with custom domain
fedeoliv Nov 12, 2021
03227a7
fix: code generation for red hat openshift cluster service
fedeoliv Feb 7, 2022
36a31a8
fix: formatting
fedeoliv Feb 7, 2022
d416787
fix: terraform formatting on red hat openshift doc
fedeoliv Feb 7, 2022
eaa6df6
fix: red hat openshift cluster test formatting
fedeoliv Feb 7, 2022
c4ff54c
fix: examples removed
fedeoliv Feb 7, 2022
e281495
fix: services format
fedeoliv Mar 23, 2022
6bb91e1
azurerm_redhatopenshift_cluster: resource schema updates
fedeoliv Jun 17, 2022
85e2b3c
azurerm_redhatopenshift_cluster: redhatopenshift package dependency u…
fedeoliv Jun 17, 2022
3145259
azurerm_redhatopenshift_cluster: profiles visibility and ingress prof…
fedeoliv Jun 22, 2022
31a1987
fix: privatedns parse tests removed
fedeoliv Jun 22, 2022
253c9af
fix: privatedns validate tests removed
fedeoliv Jun 22, 2022
7a37cc5
azurerm_redhatopenshift_cluster: azuread provider added to acceptance…
fedeoliv Jun 23, 2022
6d853cf
azurerm_redhatopenshift_cluster: cluster with fips enables aceptance …
fedeoliv Jun 23, 2022
fb22906
azurerm_redhatopenshift_cluster: acceptance tests formatting fixed
fedeoliv Jun 23, 2022
21280bb
azurerm_redhatopenshift_cluster: acceptance test for master/work node…
fedeoliv Jun 30, 2022
165f640
azurerm_redhatopenshift_cluster: fips and encryption at host properti…
fedeoliv Jun 30, 2022
2e7c9ec
azurerm_redhatopenshift_cluster: sample and argument reference update
fedeoliv Jul 1, 2022
9b0ca88
azurerm_redhatopenshift_cluster: example usage fixed
fedeoliv Jul 1, 2022
2251757
refactor: master prefix replaced by main
fedeoliv Aug 19, 2022
2410ace
docs: ARO service principal limitation note added
fedeoliv Aug 25, 2022
7f7c833
fix: service principal resources added to red hat openshift integrati…
fedeoliv Sep 21, 2022
773a435
fix: unused variables removed
fedeoliv Oct 17, 2022
82844c2
fix: vendor
fedeoliv Oct 21, 2022
9f2516b
Start of redhat openshift rewrite
mbfrahry Feb 2, 2023
f5e6a6e
continued rewrite
mbfrahry Feb 3, 2023
a74d6cb
Finish rewrite
mbfrahry Feb 6, 2023
31c1cfa
Fix tests
mbfrahry Feb 6, 2023
b2af8f8
Docs
mbfrahry Feb 7, 2023
a02ed0e
upgrade API version
teowa Oct 25, 2023
1389136
wip
teowa Oct 26, 2023
139e059
wip
teowa Oct 30, 2023
1af0bb6
wip
teowa Nov 2, 2023
46658a0
wip
teowa Nov 3, 2023
949bf37
wip
teowa Nov 7, 2023
42bf790
wip
teowa Nov 13, 2023
dea21b0
wip: test updating SP
teowa Nov 14, 2023
fa69a9f
fix update
teowa Nov 15, 2023
1afee10
remove predefinedNSG
teowa Dec 28, 2023
a2b0440
Merge branch 'main' into fedeoliv-azurerm-redhatopenshift
teowa Dec 28, 2023
a53e3b9
add notes for EncryptionAtHost
teowa Dec 28, 2023
8165f39
support version in cluster_profile
teowa Dec 28, 2023
3a68b93
fix
teowa Jan 3, 2024
0db3d93
go generate
teowa Jan 3, 2024
b68ba08
Merge branch 'main' into fedeoliv-azurerm-redhatopenshift
teowa Jan 3, 2024
f946e64
tix
teowa Jan 3, 2024
aba7f43
go mod vendor
teowa Jan 3, 2024
3696a09
add test for pull secret
teowa Jan 10, 2024
39f8d57
Merge branch 'main' into fedeoliv-azurerm-redhatopenshift
teowa Jan 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/labeler-issue-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,9 @@ service/purview:
service/recovery-services:
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(backup_|recovery_services_vault|site_recovery_)((.|\n)*)###'

service/redhatopenshift:
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_redhat_openshift_cluster((.|\n)*)###'

service/redis:
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_redis_((.|\n)*)###'

Expand Down
5 changes: 5 additions & 0 deletions .github/labeler-pull-request-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,11 @@ service/recovery-services:
- any-glob-to-any-file:
- internal/services/recoveryservices/**/*

service/redhatopenshift:
- changed-files:
- any-glob-to-any-file:
- internal/services/redhatopenshift/**/*

service/redis:
- changed-files:
- any-glob-to-any-file:
Expand Down
1 change: 1 addition & 0 deletions .teamcity/components/generated/services.kt
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ var services = mapOf(
"privatednsresolver" to "Private DNS Resolver",
"purview" to "Purview",
"recoveryservices" to "Recovery Services",
"redhatopenshift" to "Red Hat OpenShift",
"redis" to "Redis",
"redisenterprise" to "Redis Enterprise",
"relay" to "Relay",
Expand Down
3 changes: 3 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,14 @@ require (
github.com/hashicorp/terraform-registry-address v0.2.2 // indirect
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/rickb777/plural v1.4.1 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
Expand All @@ -84,6 +86,7 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
software.sslmate.com/src/go-pkcs12 v0.2.1 // indirect
)

Expand Down
9 changes: 7 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7N
github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/dave/jennifer v1.6.0 h1:MQ/6emI2xM7wt0tJzJzyUik2Q3Tcn2eE0vtYgh4GPVI=
github.com/dave/jennifer v1.6.0/go.mod h1:AxTG893FiZKqxy3FP1kL80VMshSMuz2G+EgvszgGRnk=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down Expand Up @@ -177,8 +178,9 @@ github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
Expand Down Expand Up @@ -206,6 +208,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
Expand Down Expand Up @@ -367,8 +371,9 @@ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
Expand Down
5 changes: 5 additions & 0 deletions internal/clients/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ import (
dnsresolver "github.com/hashicorp/terraform-provider-azurerm/internal/services/privatednsresolver/client"
purview "github.com/hashicorp/terraform-provider-azurerm/internal/services/purview/client"
recoveryServices "github.com/hashicorp/terraform-provider-azurerm/internal/services/recoveryservices/client"
redhatopenshift "github.com/hashicorp/terraform-provider-azurerm/internal/services/redhatopenshift/client"
redis "github.com/hashicorp/terraform-provider-azurerm/internal/services/redis/client"
redisenterprise "github.com/hashicorp/terraform-provider-azurerm/internal/services/redisenterprise/client"
relay "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/client"
Expand Down Expand Up @@ -251,6 +252,7 @@ type Client struct {
PrivateDnsResolver *dnsresolver.Client
Purview *purview.Client
RecoveryServices *recoveryServices.Client
RedHatOpenShift *redhatopenshift.Client
Redis *redis_2023_08_01.Client
RedisEnterprise *redisenterprise.Client
Relay *relay.Client
Expand Down Expand Up @@ -552,6 +554,9 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
if client.RecoveryServices, err = recoveryServices.NewClient(o); err != nil {
return fmt.Errorf("building clients for RecoveryServices: %+v", err)
}
if client.RedHatOpenShift, err = redhatopenshift.NewClient(o); err != nil {
return fmt.Errorf("building clients for RedHatOpenShift: %+v", err)
}
if client.Redis, err = redis.NewClient(o); err != nil {
return fmt.Errorf("building clients for Redis: %+v", err)
}
Expand Down
2 changes: 2 additions & 0 deletions internal/provider/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/services/privatednsresolver"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/purview"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/recoveryservices"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/redhatopenshift"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/redis"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/redisenterprise"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/relay"
Expand Down Expand Up @@ -191,6 +192,7 @@ func SupportedTypedServices() []sdk.TypedServiceRegistration {
policy.Registration{},
privatednsresolver.Registration{},
recoveryservices.Registration{},
redhatopenshift.Registration{},
resource.Registration{},
sentinel.Registration{},
serviceconnector.Registration{},
Expand Down
24 changes: 24 additions & 0 deletions internal/services/redhatopenshift/client/client.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package client

import (
"fmt"

"github.com/hashicorp/go-azure-sdk/resource-manager/redhatopenshift/2023-09-04/openshiftclusters"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

type Client struct {
OpenShiftClustersClient *openshiftclusters.OpenShiftClustersClient
}

func NewClient(o *common.ClientOptions) (*Client, error) {
openShiftClustersClient, err := openshiftclusters.NewOpenShiftClustersClientWithBaseURI(o.Environment.ResourceManager)
if err != nil {
return nil, fmt.Errorf("instantiating OpenShiftClustersClient: %+v", err)
}
o.Configure(openShiftClustersClient.Client, o.Authorizers.ResourceManager)

return &Client{
OpenShiftClustersClient: openShiftClustersClient,
}, nil
}
Loading