Skip to content

Commit

Permalink
Merge pull request #64 from chrismellard/azure
Browse files Browse the repository at this point in the history
fix: move to use canonical secret name rather than explicit passing
  • Loading branch information
jenkins-x-bot authored Sep 25, 2020
2 parents 42767b9 + 87eca0c commit 23920f9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 54 deletions.
12 changes: 0 additions & 12 deletions pkg/config/install_requirements.go
Original file line number Diff line number Diff line change
Expand Up @@ -539,16 +539,6 @@ type UserNameEmailConfig struct {
Email string `json:"email,omitempty"`
}

type AzureSecretStorageConfig struct {
TenantId string `json:"tenantId,omitempty"`
ClientId string `json:"clientId,omitempty"`
KeyVaultName string `json:"keyVaultName,omitempty"`
}

type SecretStorageConfig struct {
AzureSecretStorage *AzureSecretStorageConfig `json:"azure,omitempty"`
}

// RequirementsConfig contains the logical installation requirements in the `jx-requirements.yml` file when
// installing, configuring or upgrading Jenkins X via `jx boot`
type RequirementsConfig struct {
Expand Down Expand Up @@ -580,8 +570,6 @@ type RequirementsConfig struct {
Repository RepositoryType `json:"repository,omitempty" envconfig:"JX_REQUIREMENT_REPOSITORY"`
// SecretStorage how should we store secrets for the cluster
SecretStorage SecretStorageType `json:"secretStorage,omitempty" envconfig:"JX_REQUIREMENT_SECRET_STORAGE_TYPE"`
// SecretStorageConfig provide configuration to configure secret storage for the cluster
SecretStorageConfig *SecretStorageConfig `json:"secretStorageConfig,omitempty"`
// Storage contains storage requirements
Storage StorageConfig `json:"storage"`
// Terraform specifies if we are managing the kubernetes cluster and cloud resources with Terraform
Expand Down
42 changes: 0 additions & 42 deletions pkg/config/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 23920f9

Please sign in to comment.