Skip to content
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.

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

feat: Update crossplane module #1220

Merged
merged 43 commits into from
Dec 14, 2022

Conversation

csantanapr
Copy link
Contributor

@csantanapr csantanapr commented Nov 30, 2022

What does this PR do?

🛑 Please open an issue first to discuss any significant work and flesh out details/direction - we would hate for your time to be wasted.
Consult the CONTRIBUTING guide for submitting pull-requests.

Motivation

More

  • Yes, I have tested the PR using my local account setup (Provide any test evidence report under Additional Notes)
  • Yes, I have added a new example under examples to support my PR
  • Yes, I have created another PR for add-ons under add-ons repo (if applicable)
  • Yes, I have updated the docs for this feature
  • Yes, I ran pre-commit run -a with this PR

Note: Not all the PRs require a new example and/or doc page. In general:

  • Use an existing example when possible to demonstrate a new addons usage
  • A new docs page under docs/add-ons/* is required for new a new addon

For Moderators

  • E2E Test successfully complete before merge?

Additional Notes

Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
@csantanapr csantanapr changed the title update crossplane module Update crossplane module Dec 1, 2022
@csantanapr csantanapr changed the title Update crossplane module feat: Update crossplane module Dec 1, 2022
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
@csantanapr
Copy link
Contributor Author

need to another delay 30s, for kubernetes providerconfig
I keep getting this error

│ Error: kubernetes-provider-config failed to create kubernetes rest client for update of resource: resource [kubernetes.crossplane.io/v1alpha1/ProviderConfig] isn't valid for cluster, check the APIVersion and Kind fields are valid
│ 
│   with module.eks_blueprints_kubernetes_addons.module.crossplane[0].kubectl_manifest.kubernetes_provider_config[0],
│   on .terraform/modules/eks_blueprints_kubernetes_addons/modules/kubernetes-addons/crossplane/main.tf line 171, in resource "kubectl_manifest" "kubernetes_provider_config":
│  171: resource "kubectl_manifest" "kubernetes_provider_config" {

And is because it takes some time for crossplane to install the kubernetes package provider, and for the CRD for provider config for kubernetes to be established.

Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
Signed-off-by: Carlos Santana <csantana23@gmail.com>
resource "kubectl_manifest" "aws_controller_config" {
count = try(local.aws_provider.enable, true) ? 1 : 0
yaml_body = templatefile("${path.module}/aws-provider/aws-controller-config.yaml", {
iam-role-arn = module.aws_provider_irsa[0].irsa_iam_role_arn
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bryantbiggs I figured out how to handle the role in a better way

Signed-off-by: Carlos Santana <csantana23@gmail.com>
@csantanapr
Copy link
Contributor Author

fixed the problem with

│ Error: kubernetes-provider-config failed to create kubernetes rest client for update of resource: resource [kubernetes.crossplane.io/v1alpha1/ProviderConfig] isn't valid for cluster, check the APIVersion and Kind fields are valid
│ 
│   with module.eks_blueprints_kubernetes_addons.module.crossplane[0].kubectl_manifest.kubernetes_provider_config[0],
│   on .terraform/modules/eks_blueprints_kubernetes_addons/modules/kubernetes-addons/crossplane/main.tf line 171, in resource "kubectl_manifest" "kubernetes_provider_config":
│  171: resource "kubectl_manifest" "kubernetes_provider_config" {

Signed-off-by: Carlos Santana <csantana23@gmail.com>
@csantanapr
Copy link
Contributor Author

ok I'm done with all the changes and tests @bryantbiggs please take a another look to this PR and let me know what else should we change to get it merge.

Copy link
Contributor

@bryantbiggs bryantbiggs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@bryantbiggs bryantbiggs temporarily deployed to EKS Blueprints Test December 13, 2022 14:33 — with GitHub Actions Inactive
@bryantbiggs bryantbiggs merged commit 90346b8 into aws-ia:main Dec 14, 2022
allamand pushed a commit to allamand/terraform-aws-eks-blueprints that referenced this pull request Dec 15, 2022
Co-authored-by: Bryant Biggs <bryantbiggs@gmail.com>
Resolves undefined
allamand pushed a commit to allamand/terraform-aws-eks-blueprints that referenced this pull request Jan 10, 2023
Co-authored-by: Bryant Biggs <bryantbiggs@gmail.com>
Resolves undefined
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update crossplane module
2 participants