Skip to content

OCPBUGS-17073: Revert "Merge pull request #7205 from rna-afk/azure_managed_by_tag" #7412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Aug 24, 2023
Merged

OCPBUGS-17073: Revert "Merge pull request #7205 from rna-afk/azure_managed_by_tag" #7412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f828b08
Revert "Merge pull request #7205 from rna-afk/azure_managed_by_tag"
rna-afk Aug 9, 2023
fa32bf0
terraform: set azurerm version to v3.43.0
rna-afk Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 0 additions & 5 deletions data/data/azure/variables-azure.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ variable "azure_environment" {
description = "The target Azure cloud environment for the cluster."
}

variable "azure_managed_by" {
type = string
description = "A tag value that can be set to the azure resource group tag 'managedBy'"
}

variable "azure_region" {
type = string
description = "The target Azure region for the cluster."
Expand Down
7 changes: 3 additions & 4 deletions data/data/azure/vnet/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ provider "azurerm" {
resource "azurerm_resource_group" "main" {
count = var.azure_resource_group_name == "" ? 1 : 0

name = "${var.cluster_id}-rg"
location = var.azure_region
tags = var.azure_extra_tags
managed_by = var.azure_managed_by
name = "${var.cluster_id}-rg"
location = var.azure_region
tags = var.azure_extra_tags
}

data "azurerm_resource_group" "main" {
Expand Down
4 changes: 0 additions & 4 deletions data/data/install.openshift.io_installconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2701,10 +2701,6 @@ spec:
type: string
type: array
type: object
managedBy:
description: ManagedBy is a field that can be set to the azure
resource group.
type: string
networkResourceGroupName:
description: NetworkResourceGroupName specifies the network resource
group that contains an existing VNet
Expand Down
6 changes: 0 additions & 6 deletions pkg/asset/cluster/tfvars.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,11 +373,6 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
bootstrapIgnStub = string(shim)
}

managedBy := installConfig.Config.Platform.Azure.ManagedBy
if managedBy == "" {
managedBy = "Openshift"
}

data, err := azuretfvars.TFVars(
azuretfvars.TFVarsSources{
Auth: auth,
Expand All @@ -397,7 +392,6 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
HyperVGeneration: hyperVGeneration,
VMArchitecture: installConfig.Config.ControlPlane.Architecture,
InfrastructureName: clusterID.InfraID,
ManagedBy: managedBy,
},
)
if err != nil {
Expand Down
3 changes: 0 additions & 3 deletions pkg/explain/printer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,6 @@ func Test_PrintFields(t *testing.T) {
defaultMachinePlatform <object>
DefaultMachinePlatform is the default configuration used when installing on Azure for machine pools which do not define their own platform configuration.

managedBy <string>
ManagedBy is a field that can be set to the azure resource group.

networkResourceGroupName <string>
NetworkResourceGroupName specifies the network resource group that contains an existing VNet

Expand Down
3 changes: 0 additions & 3 deletions pkg/tfvars/azure/azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ type config struct {
VMNetworkingType bool `json:"azure_control_plane_vm_networking_type"`
RandomStringPrefix string `json:"random_storage_account_suffix"`
VMArchitecture string `json:"azure_vm_architecture"`
ManagedBy string `json:"azure_managed_by"`
UseMarketplaceImage bool `json:"azure_use_marketplace_image"`
MarketplaceImageHasPlan bool `json:"azure_marketplace_image_has_plan"`
OSImage `json:",inline"`
Expand Down Expand Up @@ -91,7 +90,6 @@ type TFVarsSources struct {
HyperVGeneration string
VMArchitecture types.Architecture
InfrastructureName string
ManagedBy string
}

// TFVars generates Azure-specific Terraform variables launching the cluster.
Expand Down Expand Up @@ -181,7 +179,6 @@ func TFVars(sources TFVarsSources) ([]byte, error) {
RandomStringPrefix: randomStringPrefixFunction(),
VMArchitecture: vmarch,
ExtraTags: tags,
ManagedBy: sources.ManagedBy,
UseMarketplaceImage: osImage.Publisher != "",
MarketplaceImageHasPlan: masterConfig.Image.Type != machineapi.AzureImageTypeMarketplaceNoPlan,
OSImage: osImage,
Expand Down
3 changes: 0 additions & 3 deletions pkg/types/azure/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ type Platform struct {
// +optional
DefaultMachinePlatform *MachinePool `json:"defaultMachinePlatform,omitempty"`

// ManagedBy is a field that can be set to the azure resource group.
ManagedBy string `json:"managedBy,omitempty"`

// NetworkResourceGroupName specifies the network resource group that contains an existing VNet
//
// +optional
Expand Down
51 changes: 27 additions & 24 deletions terraform/providers/azurerm/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ module github.com/openshift/installer/terraform/providers/azurerm

go 1.18

require github.com/hashicorp/terraform-provider-azurerm v1.44.1-0.20230707132751-e101fa44af9f // v3.64.0
require github.com/hashicorp/terraform-provider-azurerm v1.44.1-0.20230210023348-72f0799cec36 // v3.43.0

require (
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
github.com/Azure/go-autorest/autorest/azure/cli v0.4.6 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
Expand All @@ -17,39 +18,43 @@ require (
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/btubbs/datetime v0.1.1 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-azure-helpers v0.57.0 // indirect
github.com/hashicorp/go-azure-sdk v0.20230704.1182735 // indirect
github.com/hashicorp/go-azure-helpers v0.51.0 // indirect
github.com/hashicorp/go-azure-sdk v0.20230208.1165725 // indirect
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637 // indirect
github.com/hashicorp/go-hclog v1.4.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-plugin v1.4.8 // indirect
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hc-install v0.5.0 // indirect
github.com/hashicorp/hcl/v2 v2.16.2 // indirect
github.com/hashicorp/hc-install v0.4.0 // indirect
github.com/hashicorp/hcl/v2 v2.15.0 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-exec v0.18.1 // indirect
github.com/hashicorp/terraform-json v0.16.0 // indirect
github.com/hashicorp/terraform-exec v0.17.3 // indirect
github.com/hashicorp/terraform-json v0.14.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.14.3 // indirect
github.com/hashicorp/terraform-plugin-log v0.8.0 // indirect
github.com/hashicorp/terraform-plugin-sdk/v2 v2.26.1 // indirect
github.com/hashicorp/terraform-plugin-log v0.7.0 // indirect
github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1 // indirect
github.com/hashicorp/terraform-plugin-testing v1.0.0 // indirect
github.com/hashicorp/terraform-registry-address v0.1.0 // indirect
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
github.com/manicminer/hamilton v0.55.0 // indirect
github.com/manicminer/hamilton-autorest v0.3.0 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
Expand All @@ -58,23 +63,21 @@ require (
github.com/rickb777/date v1.19.1 // indirect
github.com/rickb777/plural v1.4.1 // indirect
github.com/tombuildsstuff/giovanni v0.20.0 // indirect
github.com/tombuildsstuff/kermit v0.20230530.1150329 // indirect
github.com/tombuildsstuff/kermit v0.20230208.1135849 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
github.com/vmihailenco/tagparser v0.1.2 // indirect
github.com/zclconf/go-cty v1.13.1 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.10.0 // indirect
github.com/zclconf/go-cty v1.12.1 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
google.golang.org/grpc v1.53.0 // indirect
google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac // indirect
google.golang.org/grpc v1.51.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
software.sslmate.com/src/go-pkcs12 v0.2.0 // indirect
)

// https://bugzilla.redhat.com/show_bug.cgi?id=2064702
Expand Down
Loading