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

Revert instance diff changes #333

Closed
wants to merge 32 commits into from

Commits on Nov 12, 2023

  1. Add server-side apply merge strategy markers

    This commit adds SSA merge strategy markers that allow the API server to
    granularly merge lists, rather than atomically replacing them. Composition
    functions use SSA, so this change means that a function can return only the list
    elements it desires (e.g. tags) and those elements will be merged into any
    existing elements, without replacing them.
    
    For the moment I've only covered two cases:
    
    * Lists that we know are sets of scalar values (generated from Terraform sets)
    * Maps of scalar values (generated from Terraform maps)
    
    I'm hopeful that in both of these cases it _should_ be possible to allow the map
    or set to be granularly merged, not atomically replaced.
    
    https://kubernetes.io/docs/reference/using-api/server-side-apply/#merge-strategy
    
    Signed-off-by: Nic Cope <[email protected]>
    negz committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    8ef1aa2 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Post release commit after v1.0.0

    Signed-off-by: Alper Rifat Ulucinar <[email protected]>
    ulucinar committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    bed1fa2 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Make main-tf contents exported

    Signed-off-by: Mitch Connors <[email protected]>
    therealmitchconnors committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    0752be6 View commit details
    Browse the repository at this point in the history
  2. fix signature

    Signed-off-by: Mitch Connors <[email protected]>
    therealmitchconnors committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    c40331d View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Fix kubebuilder topological markers: use "=" instead of ":" between t…

    …okens
    
    - Do not add topological markers for sensitive fields
    
    Signed-off-by: Alper Rifat Ulucinar <[email protected]>
    ulucinar committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    5150500 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Merge pull request crossplane#301 from negz/scribble

    Add server-side apply merge strategy markers
    ulucinar authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    ca2cfe6 View commit details
    Browse the repository at this point in the history
  2. Pass default and configured timeouts to InstanceState for using the t…

    …imeouts while Observe calls
    
    Signed-off-by: Sergen Yalçın <[email protected]>
    sergenyalcin committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    f99dee3 View commit details
    Browse the repository at this point in the history
  3. Merge pull request crossplane#309 from sergenyalcin/set-timeouts-inst…

    …ancestate
    
    Put default and configured timeouts to InstanceState for using the timeouts while Observe calls
    sergenyalcin authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    a978820 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Add exported function description

    Signed-off-by: Mitch Connors <[email protected]>
    therealmitchconnors committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    25a4aa5 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Call the registered schema.CustomizeDiffFunc functions in the Terrafo…

    …rm SDK-based external client
    
    Signed-off-by: Alper Rifat Ulucinar <[email protected]>
    ulucinar committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    7431179 View commit details
    Browse the repository at this point in the history
  2. Merge pull request crossplane#311 from ulucinar/enable-customizediff

    Call the registered schema.CustomizeDiffFunc functions in the Terraform SDK-based external client
    ulucinar authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    77613fd View commit details
    Browse the repository at this point in the history
  3. Ignore specific error that returned by expandWildcard function

    Signed-off-by: Sergen Yalçın <[email protected]>
    sergenyalcin committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    085ff0a View commit details
    Browse the repository at this point in the history
  4. Merge pull request crossplane#223 from therealmitchconnors/main

    Make main-tf contents exported
    ulucinar authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    a46199f View commit details
    Browse the repository at this point in the history
  5. Add config.Resource.ServerSideApplyMergeStrategies to be able to conf…

    …igure
    
    the server-side apply merge strategies for object lists & maps.
    
    Signed-off-by: Alper Rifat Ulucinar <[email protected]>
    ulucinar committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    0fc0a07 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Merge pull request crossplane#312 from sergenyalcin/handle--notfound-…

    …error-type
    
    Ignore specific error that returned by expandWildcard function
    sergenyalcin authored Dec 13, 2023
    Configuration menu
    Copy the full SHA
    cf1b346 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Cache the Terraform instance state returned from schema.Resource.Apply

    in external-client's Create even if the returned diagnostics contain
    errors.
    
    - In most cases, the Terraform plugin SDK's create implementation
      for a resource comprises multiple steps (with the creation of
      the external resource being the very first step). In case, the
      creation succeeds but any of the subsequent steps fail, then
      upjet's TF plugin SDK-based external client will not record
      this state losing the only opportunity to associate the MR
      with the newly provisioned external resource in some cases.
      We now put this initial state into the upjet's in-memory
      state cache so that it's now available for the external-
      client's next observe call.
    
    Signed-off-by: Alper Rifat Ulucinar <[email protected]>
    ulucinar committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    b674f3d View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. Merge pull request crossplane#313 from ulucinar/capture-id

    Cache the Terraform instance state returned from schema.Resource.Apply even if the returned diagnostics contain errors
    ulucinar authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    9543be9 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. Merge pull request crossplane#308 from ulucinar/ssa-object-lists

    Add config.Resource. ServerSideApplyMergeStrategies to configure the SSA Merge Strategies
    ulucinar authored Dec 21, 2023
    Configuration menu
    Copy the full SHA
    807fb9d View commit details
    Browse the repository at this point in the history
  2. Add reference fields to the InitProvider

    Signed-off-by: Sergen Yalçın <[email protected]>
    sergenyalcin committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    eb239f4 View commit details
    Browse the repository at this point in the history
  3. Pass full state to GetExternalNameFn function to access field other t…

    …han ID
    
    Signed-off-by: Sergen Yalçın <[email protected]>
    sergenyalcin committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    ac7c6a1 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. - Check if the id is empty

    - Move the error check to the correct place
    
    Signed-off-by: Sergen Yalçın <[email protected]>
    sergenyalcin committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    f548c79 View commit details
    Browse the repository at this point in the history
  2. Merge pull request crossplane#316 from sergenyalcin/pass-allstate-to-…

    …getexternalnamefn
    
    Pass full state to GetExternalNameFn function to access field other than ID
    sergenyalcin authored Dec 22, 2023
    Configuration menu
    Copy the full SHA
    0bc8185 View commit details
    Browse the repository at this point in the history
  3. Alias diag import

    Signed-off-by: Alper Rifat Ulucinar <[email protected]>
    ulucinar committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    b15649b View commit details
    Browse the repository at this point in the history
  4. Return the cty.Value of InstanceState from noForkExternal.fromInstanc…

    …eStateToJSONMap
    
    Signed-off-by: Alper Rifat Ulucinar <[email protected]>
    ulucinar committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    74159f8 View commit details
    Browse the repository at this point in the history
  5. Set the RawPlan for a new terraform.InstanceState returned from an ob…

    …servation
    
    Signed-off-by: Alper Rifat Ulucinar <[email protected]>
    ulucinar committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    f0de67a View commit details
    Browse the repository at this point in the history
  6. Merge pull request crossplane#317 from ulucinar/fix-customize-diff

    Set the RawPlan for a new terraform.InstanceState returned from an observation
    ulucinar authored Dec 22, 2023
    Configuration menu
    Copy the full SHA
    1d547af View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2023

  1. Set diff state's Attributes to nil if the resource does not exist

    Signed-off-by: Alper Rifat Ulucinar <[email protected]>
    ulucinar committed Dec 25, 2023
    Configuration menu
    Copy the full SHA
    ccb0611 View commit details
    Browse the repository at this point in the history
  2. Merge pull request crossplane#318 from ulucinar/fix-diff-state

    Set diff state's Attributes to nil if the resource does not exist
    ulucinar authored Dec 25, 2023
    Configuration menu
    Copy the full SHA
    81e2620 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. Fix nonintentional if case

    Signed-off-by: Sergen Yalçın <[email protected]>
    sergenyalcin committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    6a56e73 View commit details
    Browse the repository at this point in the history
  2. Merge pull request crossplane#315 from sergenyalcin/support-reference…

    …s-for-initprovider
    
    Add reference fields to the InitProvider
    sergenyalcin authored Dec 26, 2023
    Configuration menu
    Copy the full SHA
    fb8acdb View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Revert "Merge pull request crossplane#318 from ulucinar/fix-diff-state"

    This reverts commit 81e2620, reversing
    changes made to 1d547af.
    
    Signed-off-by: Matt Bush <[email protected]>
    mbbush committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    f33d01b View commit details
    Browse the repository at this point in the history
  2. Revert "Merge pull request crossplane#317 from ulucinar/fix-customize…

    …-diff"
    
    This reverts commit 1d547af, reversing
    changes made to 0bc8185.
    
    Signed-off-by: Matt Bush <[email protected]>
    mbbush committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    cd53d7a View commit details
    Browse the repository at this point in the history