diff --git a/.github/workflows/postsubmit.yaml b/.github/workflows/postsubmit.yaml new file mode 100644 index 0000000..db87c26 --- /dev/null +++ b/.github/workflows/postsubmit.yaml @@ -0,0 +1,10 @@ +name: Hydrate Go Proxy + +on: + push: + branches: + - main + +jobs: + call-hydrate-go-proxy: + uses: aws-controllers-k8s/.github/.github/workflows/reusable-postsubmit.yaml@main diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index 0da09a9..9af6d71 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -1,14 +1,16 @@ # Open Source Software Attribution +[//]: # (File generated by attribution-gen. DO NOT EDIT.) + The github.com/aws-controllers-k8s/opensearchserverless-controller source code is licensed under the -Apache License, version 2.0. A copy of this license is available in the +Apache-2.0 license. A copy of this license is available in the [LICENSE](LICENSE) file in the root source code directory and is included, along with this document, in any images containing github.com/aws-controllers-k8s/opensearchserverless-controller binaries. ## Package dependencies -The module github.com/aws-controllers-k8s/opensearchserverless-controller depends on a number of Open Source Go packages. Direct +The module github.com/aws-controllers-k8s/opensearchserverless-controller depends on a number of Open Source Go packages. Direct dependencies are listed in the ./go.mod file. Those direct package dependencies have some dependencies of their own (known as "transitive dependencies") @@ -20,17 +22,26 @@ License version 2.0, we include the full text of the package's License below. * `github.com/aws-controllers-k8s/runtime` * `github.com/aws/aws-sdk-go` +* `github.com/aws/aws-sdk-go-v2` +* `github.com/aws/aws-sdk-go-v2/service/opensearchserverless` +* `github.com/aws/smithy-go` +* `github.com/go-logr/logr` * `github.com/spf13/pflag` +* `k8s.io/api` * `k8s.io/apimachinery` * `k8s.io/client-go` * `sigs.k8s.io/controller-runtime` ### github.com/aws-controllers-k8s/runtime -Apache License version 2.0 +License Identifier: Apache-2.0 Subdependencies: -* `github.com/aws/aws-sdk-go` +* `github.com/aws/aws-sdk-go-v2` +* `github.com/aws/aws-sdk-go-v2/config` +* `github.com/aws/aws-sdk-go-v2/credentials` +* `github.com/aws/aws-sdk-go-v2/service/sts` +* `github.com/aws/smithy-go` * `github.com/cenkalti/backoff/v4` * `github.com/go-logr/logr` * `github.com/google/go-cmp` @@ -47,6 +58,14 @@ Subdependencies: * `k8s.io/client-go` * `k8s.io/klog/v2` * `sigs.k8s.io/controller-runtime` +* `github.com/aws/aws-sdk-go-v2/feature/ec2/imds` +* `github.com/aws/aws-sdk-go-v2/internal/configsources` +* `github.com/aws/aws-sdk-go-v2/internal/endpoints/v2` +* `github.com/aws/aws-sdk-go-v2/internal/ini` +* `github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding` +* `github.com/aws/aws-sdk-go-v2/service/internal/presigned-url` +* `github.com/aws/aws-sdk-go-v2/service/sso` +* `github.com/aws/aws-sdk-go-v2/service/ssooidc` * `github.com/beorn7/perks` * `github.com/cespare/xxhash/v2` * `github.com/davecgh/go-spew` @@ -60,14 +79,12 @@ Subdependencies: * `github.com/go-openapi/jsonreference` * `github.com/go-openapi/swag` * `github.com/gogo/protobuf` -* `github.com/golang/groupcache` * `github.com/golang/protobuf` +* `github.com/google/btree` * `github.com/google/gnostic-models` * `github.com/google/gofuzz` * `github.com/google/uuid` -* `github.com/imdario/mergo` * `github.com/itchyny/timefmt-go` -* `github.com/jmespath/go-jmespath` * `github.com/josharian/intern` * `github.com/json-iterator/go` * `github.com/mailru/easyjson` @@ -84,15 +101,16 @@ Subdependencies: * `golang.org/x/exp` * `golang.org/x/net` * `golang.org/x/oauth2` +* `golang.org/x/sync` * `golang.org/x/sys` * `golang.org/x/term` * `golang.org/x/text` * `golang.org/x/time` +* `golang.org/x/tools` * `gomodules.xyz/jsonpatch/v2` * `google.golang.org/protobuf` * `gopkg.in/evanphx/json-patch.v4` * `gopkg.in/inf.v0` -* `gopkg.in/yaml.v2` * `gopkg.in/yaml.v3` * `k8s.io/apiextensions-apiserver` * `k8s.io/kube-openapi` @@ -101,12 +119,30 @@ Subdependencies: * `sigs.k8s.io/structured-merge-diff/v4` * `sigs.k8s.io/yaml` -#### github.com/aws/aws-sdk-go +#### github.com/aws/aws-sdk-go-v2 + +License Identifier: Apache-2.0 + +#### github.com/aws/aws-sdk-go-v2/config + +License Identifier: Apache-2.0 + +#### github.com/aws/aws-sdk-go-v2/credentials + +License Identifier: Apache-2.0 + +#### github.com/aws/aws-sdk-go-v2/service/sts -Apache License version 2.0 +License Identifier: Apache-2.0 + +#### github.com/aws/smithy-go + +License Identifier: Apache-2.0 #### github.com/cenkalti/backoff/v4 +License Identifier: MIT + The MIT License (MIT) Copyright (c) 2014 Cenk Altı @@ -130,10 +166,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #### github.com/go-logr/logr -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/google/go-cmp +License Identifier: BSD-3-Clause + Copyright (c) 2017 The Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -164,6 +202,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### github.com/itchyny/gojq +License Identifier: MIT + The MIT License (MIT) Copyright (c) 2019-2021 itchyny @@ -188,10 +228,12 @@ SOFTWARE. #### github.com/jaypipes/envutil -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/pkg/errors +License Identifier: BSD-2-Clause + Copyright (c) 2015, Dave Cheney All rights reserved. @@ -218,10 +260,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### github.com/prometheus/client_golang -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/samber/lo +License Identifier: MIT + MIT License Copyright (c) 2022 Samuel Berthe @@ -246,6 +290,8 @@ SOFTWARE. #### github.com/spf13/pflag +License Identifier: BSD-3-Clause + Copyright (c) 2012 Alex Ogier. All rights reserved. Copyright (c) 2012 The Go Authors. All rights reserved. @@ -277,6 +323,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### github.com/stretchr/testify +License Identifier: MIT + MIT License Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors. @@ -323,23 +371,55 @@ THE SOFTWARE. #### k8s.io/api -Apache License version 2.0 +License Identifier: Apache-2.0 #### k8s.io/apimachinery -Apache License version 2.0 +License Identifier: Apache-2.0 #### k8s.io/client-go -Apache License version 2.0 +License Identifier: Apache-2.0 #### k8s.io/klog/v2 -Apache License version 2.0 +License Identifier: Apache-2.0 #### sigs.k8s.io/controller-runtime -Apache License version 2.0 +License Identifier: Apache-2.0 + +#### github.com/aws/aws-sdk-go-v2/feature/ec2/imds + +License Identifier: Apache-2.0 + +#### github.com/aws/aws-sdk-go-v2/internal/configsources + +License Identifier: Apache-2.0 + +#### github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 + +License Identifier: Apache-2.0 + +#### github.com/aws/aws-sdk-go-v2/internal/ini + +License Identifier: Apache-2.0 + +#### github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding + +License Identifier: Apache-2.0 + +#### github.com/aws/aws-sdk-go-v2/service/internal/presigned-url + +License Identifier: Apache-2.0 + +#### github.com/aws/aws-sdk-go-v2/service/sso + +License Identifier: Apache-2.0 + +#### github.com/aws/aws-sdk-go-v2/service/ssooidc + +License Identifier: Apache-2.0 #### github.com/beorn7/perks @@ -366,6 +446,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #### github.com/cespare/xxhash/v2 +License Identifier: MIT + Copyright (c) 2016 Caleb Spare MIT License @@ -391,6 +473,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #### github.com/davecgh/go-spew +License Identifier: ISC + ISC License Copyright (c) 2012-2016 Dave Collins @@ -409,6 +493,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #### github.com/emicklei/go-restful/v3 +License Identifier: MIT + Copyright (c) 2012,2013 Ernest Micklei MIT License @@ -434,6 +520,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #### github.com/evanphx/json-patch +License Identifier: BSD-3-Clause + Copyright (c) 2014, Evan Phoenix All rights reserved. @@ -462,6 +550,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### github.com/evanphx/json-patch/v5 +License Identifier: BSD-3-Clause + Copyright (c) 2014, Evan Phoenix All rights reserved. @@ -490,6 +580,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### github.com/fsnotify/fsnotify +License Identifier: BSD-3-Clause + Copyright © 2012 The Go Authors. All rights reserved. Copyright © fsnotify Authors. All rights reserved. @@ -518,6 +610,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### github.com/fxamacker/cbor/v2 +License Identifier: MIT + MIT License Copyright (c) 2019-present Faye Amacker @@ -542,22 +636,24 @@ SOFTWARE. #### github.com/go-logr/zapr -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/go-openapi/jsonpointer -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/go-openapi/jsonreference -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/go-openapi/swag -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/gogo/protobuf +License Identifier: BSD-3-Clause + Copyright (c) 2013, The GoGo Authors. All rights reserved. Protocol Buffers for Go with Gadgets @@ -593,12 +689,10 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#### github.com/golang/groupcache - -Apache License version 2.0 - #### github.com/golang/protobuf +License Identifier: BSD-3-Clause + Copyright 2010 The Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -627,48 +721,23 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#### github.com/google/btree + +License Identifier: Apache-2.0 + #### github.com/google/gnostic-models -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/google/gofuzz -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/google/uuid -Copyright (c) 2009,2014 Google Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: +License Identifier: BSD-3-Clause - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#### github.com/imdario/mergo - -Copyright (c) 2013 Dario Castañé. All rights reserved. -Copyright (c) 2012 The Go Authors. All rights reserved. +Copyright (c) 2009,2014 Google Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -698,6 +767,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### github.com/itchyny/timefmt-go +License Identifier: MIT + The MIT License (MIT) Copyright (c) 2020,2021 itchyny @@ -720,12 +791,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -#### github.com/jmespath/go-jmespath - -Apache License version 2.0 - #### github.com/josharian/intern +License Identifier: MIT + MIT License Copyright (c) 2019 Josh Bleecher Snyder @@ -750,6 +819,8 @@ SOFTWARE. #### github.com/json-iterator/go +License Identifier: MIT + MIT License Copyright (c) 2016 json-iterator @@ -784,14 +855,16 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI #### github.com/modern-go/concurrent -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/modern-go/reflect2 -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/munnerz/goautoneg +License Identifier: BSD-3-Clause + Copyright (c) 2011, Open Knowledge Foundation Ltd. All rights reserved. @@ -826,6 +899,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### github.com/pmezard/go-difflib +License Identifier: BSD-3-Clause + Copyright (c) 2013, Patrick Mezard All rights reserved. @@ -856,18 +931,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### github.com/prometheus/client_model -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/prometheus/common -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/prometheus/procfs -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/stretchr/objx +License Identifier: MIT + The MIT License Copyright (c) 2014 Stretchr, Inc. @@ -893,6 +970,8 @@ SOFTWARE. #### github.com/x448/float16 +License Identifier: MIT + MIT License Copyright (c) 2019 Montgomery Edwards⁴⁴⁸ and Faye Amacker @@ -939,7 +1018,9 @@ THE SOFTWARE. #### golang.org/x/exp -Copyright (c) 2009 The Go Authors. All rights reserved. +License Identifier: BSD-3-Clause + +Copyright 2009 The Go Authors. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -951,7 +1032,7 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its + * Neither the name of Google LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -969,7 +1050,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### golang.org/x/net -Copyright (c) 2009 The Go Authors. All rights reserved. +License Identifier: BSD-3-Clause + +Copyright 2009 The Go Authors. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -981,7 +1064,7 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its + * Neither the name of Google LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -999,7 +1082,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### golang.org/x/oauth2 -Copyright (c) 2009 The Go Authors. All rights reserved. +License Identifier: BSD-3-Clause + +Copyright 2009 The Go Authors. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -1011,7 +1096,39 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its + * Neither the name of Google LLC nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#### golang.org/x/sync + +License Identifier: BSD-3-Clause + +Copyright 2009 The Go Authors. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -1029,7 +1146,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### golang.org/x/sys -Copyright (c) 2009 The Go Authors. All rights reserved. +License Identifier: BSD-3-Clause + +Copyright 2009 The Go Authors. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -1041,7 +1160,7 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its + * Neither the name of Google LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -1059,7 +1178,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### golang.org/x/term -Copyright (c) 2009 The Go Authors. All rights reserved. +License Identifier: BSD-3-Clause + +Copyright 2009 The Go Authors. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -1071,7 +1192,7 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its + * Neither the name of Google LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -1089,7 +1210,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### golang.org/x/text -Copyright (c) 2009 The Go Authors. All rights reserved. +License Identifier: BSD-3-Clause + +Copyright 2009 The Go Authors. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -1101,7 +1224,7 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its + * Neither the name of Google LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -1119,7 +1242,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### golang.org/x/time -Copyright (c) 2009 The Go Authors. All rights reserved. +License Identifier: BSD-3-Clause + +Copyright 2009 The Go Authors. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -1131,7 +1256,39 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its + * Neither the name of Google LLC nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#### golang.org/x/tools + +License Identifier: BSD-3-Clause + +Copyright 2009 The Go Authors. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -1149,10 +1306,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### gomodules.xyz/jsonpatch/v2 -Apache License version 2.0 +License Identifier: Apache-2.0 #### google.golang.org/protobuf +License Identifier: BSD-3-Clause + Copyright (c) 2018 The Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -1183,6 +1342,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### gopkg.in/evanphx/json-patch.v4 +License Identifier: BSD-3-Clause + Copyright (c) 2014, Evan Phoenix All rights reserved. @@ -1211,6 +1372,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### gopkg.in/inf.v0 +License Identifier: BSD-3-Clause + Copyright (c) 2012 Péter Surányi. Portions Copyright (c) 2009 The Go Authors. All rights reserved. @@ -1240,28 +1403,26 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#### gopkg.in/yaml.v2 - -Apache License version 2.0 - #### gopkg.in/yaml.v3 -Apache License version 2.0 +License Identifier: Apache-2.0 #### k8s.io/apiextensions-apiserver -Apache License version 2.0 +License Identifier: Apache-2.0 #### k8s.io/kube-openapi -Apache License version 2.0 +License Identifier: Apache-2.0 #### k8s.io/utils -Apache License version 2.0 +License Identifier: Apache-2.0 #### sigs.k8s.io/json +License Identifier: BSD-3-Clause + Files other than internal/golang/* licensed under: @@ -1503,38 +1664,62 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #### sigs.k8s.io/structured-merge-diff/v4 -Apache License version 2.0 +License Identifier: Apache-2.0 #### sigs.k8s.io/yaml -Apache License version 2.0 +License Identifier: Apache-2.0 ### github.com/aws/aws-sdk-go -Apache License version 2.0 +License Identifier: Apache-2.0 Subdependencies: * `github.com/jmespath/go-jmespath` +#### github.com/jmespath/go-jmespath + +License Identifier: Apache-2.0 + +### github.com/aws/aws-sdk-go-v2 + +License Identifier: Apache-2.0 + +Subdependencies: +* `github.com/aws/smithy-go` + +### github.com/aws/aws-sdk-go-v2/service/opensearchserverless + +License Identifier: Apache-2.0 + +Subdependencies: +* `github.com/aws/aws-sdk-go-v2` +* `github.com/aws/aws-sdk-go-v2/internal/configsources` +* `github.com/aws/aws-sdk-go-v2/internal/endpoints/v2` +* `github.com/aws/smithy-go` + + + + + + + ### k8s.io/apimachinery -Apache License version 2.0 +License Identifier: Apache-2.0 Subdependencies: * `github.com/armon/go-socks5` * `github.com/davecgh/go-spew` * `github.com/fxamacker/cbor/v2` * `github.com/gogo/protobuf` -* `github.com/golang/protobuf` * `github.com/google/gnostic-models` * `github.com/google/go-cmp` -* `github.com/google/gofuzz` * `github.com/google/uuid` * `github.com/moby/spdystream` * `github.com/mxk/go-flowrate` -* `github.com/onsi/ginkgo/v2` * `github.com/spf13/pflag` * `github.com/stretchr/testify` * `golang.org/x/net` @@ -1545,33 +1730,32 @@ Subdependencies: * `k8s.io/kube-openapi` * `k8s.io/utils` * `sigs.k8s.io/json` +* `sigs.k8s.io/randfill` * `sigs.k8s.io/structured-merge-diff/v4` * `sigs.k8s.io/yaml` * `github.com/go-logr/logr` * `github.com/go-openapi/jsonpointer` * `github.com/go-openapi/jsonreference` * `github.com/go-openapi/swag` -* `github.com/go-task/slim-sprig/v3` -* `github.com/google/pprof` * `github.com/josharian/intern` * `github.com/json-iterator/go` -* `github.com/kr/pretty` * `github.com/mailru/easyjson` * `github.com/modern-go/concurrent` * `github.com/modern-go/reflect2` +* `github.com/onsi/ginkgo/v2` +* `github.com/onsi/gomega` * `github.com/pkg/errors` * `github.com/pmezard/go-difflib` * `github.com/rogpeppe/go-internal` * `github.com/x448/float16` -* `golang.org/x/sys` * `golang.org/x/text` -* `golang.org/x/tools` * `google.golang.org/protobuf` -* `gopkg.in/yaml.v2` * `gopkg.in/yaml.v3` #### github.com/armon/go-socks5 +License Identifier: MIT + The MIT License (MIT) Copyright (c) 2014 Armon Dadgar @@ -1605,16 +1789,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - - - #### github.com/moby/spdystream -Apache License version 2.0 +License Identifier: Apache-2.0 #### github.com/mxk/go-flowrate +License Identifier: BSD-3-Clause + Copyright (c) 2014 The Go-FlowRate Authors. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -1645,33 +1827,33 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#### github.com/onsi/ginkgo/v2 -Copyright (c) 2013-2014 Onsi Fakhouri -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. +#### github.com/stretchr/testify -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +License Identifier: MIT +MIT License +Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. @@ -1689,7 +1871,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +#### sigs.k8s.io/randfill +License Identifier: Apache-2.0 @@ -1700,107 +1884,104 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -#### github.com/go-task/slim-sprig/v3 -Copyright (C) 2013-2020 Masterminds -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -#### github.com/google/pprof -Apache License version 2.0 -#### github.com/kr/pretty -Copyright 2012 Keith Rarick -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +#### github.com/onsi/ginkgo/v2 -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +Copyright (c) 2013-2014 Onsi Fakhouri -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +#### github.com/onsi/gomega +Copyright (c) 2013-2014 Onsi Fakhouri +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +#### github.com/pmezard/go-difflib -#### github.com/rogpeppe/go-internal +License Identifier: BSD-3-Clause -Copyright (c) 2018 The Go Authors. All rights reserved. +Copyright (c) 2013, Patrick Mezard +All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - - + Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + The names of its contributors may not be used to endorse or promote +products derived from this software without specific prior written +permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#### github.com/rogpeppe/go-internal -#### golang.org/x/tools +License Identifier: BSD-3-Clause -Copyright (c) 2009 The Go Authors. All rights reserved. +Copyright (c) 2018 The Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -1827,3 +2008,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + + diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 371b42b..70ccd79 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,8 +1,8 @@ ack_generate_info: - build_date: "2025-11-12T23:12:32Z" - build_hash: c833f2d14f4fe8953663ff92f4661ae5fb01b8c8 + build_date: "2025-11-23T09:21:15Z" + build_hash: e922bb8587f26eeed72a531e5d92389b81e8b55b go_version: go1.25.4 - version: v0.53.1 + version: v0.54.0 api_directory_checksum: f27db0327167670395f1f06471960f393d57f6b8 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 8c4b68b..0802007 100644 --- a/config/controller/kustomization.yaml +++ b/config/controller/kustomization.yaml @@ -6,4 +6,4 @@ kind: Kustomization images: - name: controller newName: public.ecr.aws/aws-controllers-k8s/opensearchserverless-controller - newTag: 0.2.2 + newTag: 0.2.3 diff --git a/go.mod b/go.mod index a80652d..5c80a6c 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24.0 toolchain go1.24.1 require ( - github.com/aws-controllers-k8s/runtime v0.53.1 + github.com/aws-controllers-k8s/runtime v0.54.1 github.com/aws/aws-sdk-go v1.55.7 github.com/aws/aws-sdk-go-v2 v1.36.3 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.19.2 diff --git a/go.sum b/go.sum index a404caf..57f533d 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/aws-controllers-k8s/runtime v0.53.1 h1:l9MkR1KfZW8H8icT5rrRK3pdnVVA4io/eINVe5aspWs= -github.com/aws-controllers-k8s/runtime v0.53.1/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc= +github.com/aws-controllers-k8s/runtime v0.54.1 h1:0mbCJELz3t7jbG4abNecF0yeRd8YeFZQPr7nnzr8DC8= +github.com/aws-controllers-k8s/runtime v0.54.1/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc= github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE= github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 60bf779..444eee0 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: opensearchserverless-chart description: A Helm chart for the ACK service controller for Amazon OpenSearch Serverless (opensearchserverless) -version: 0.2.2 -appVersion: 0.2.2 +version: 0.2.3 +appVersion: 0.2.3 home: https://github.com/aws-controllers-k8s/opensearchserverless-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt index cbf9590..288c015 100644 --- a/helm/templates/NOTES.txt +++ b/helm/templates/NOTES.txt @@ -1,5 +1,5 @@ {{ .Chart.Name }} has been installed. -This chart deploys "public.ecr.aws/aws-controllers-k8s/opensearchserverless-controller:0.2.2". +This chart deploys "public.ecr.aws/aws-controllers-k8s/opensearchserverless-controller:0.2.3". Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/helm/values.yaml b/helm/values.yaml index 9d2065d..dff7133 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/opensearchserverless-controller - tag: 0.2.2 + tag: 0.2.3 pullPolicy: IfNotPresent pullSecrets: [] @@ -120,8 +120,11 @@ watchSelectors: "" resourceTags: # Configures the ACK service controller to always set key/value pairs tags on # resources that it manages. + # Note: Tags with empty values are automatically skipped to keep resources clean. - services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION% - services.k8s.aws/namespace=%K8S_NAMESPACE% + - app.kubernetes.io/managed-by=%MANAGED_BY% + - kro.run/kro-version=%KRO_VERSION% # Set to "retain" to keep all AWS resources intact even after the K8s resources # have been deleted. By default, the ACK controller will delete the AWS resource diff --git a/pkg/resource/collection/manager.go b/pkg/resource/collection/manager.go index 41b517b..7fd4391 100644 --- a/pkg/resource/collection/manager.go +++ b/pkg/resource/collection/manager.go @@ -297,13 +297,26 @@ func (rm *resourceManager) EnsureTags( return nil } -// FilterAWSTags ignores tags that have keys that start with "aws:" -// is needed to ensure the controller does not attempt to remove -// tags set by AWS. This function needs to be called after each Read -// operation. -// Eg. resources created with cloudformation have tags that cannot be -// removed by an ACK controller -func (rm *resourceManager) FilterSystemTags(res acktypes.AWSResource) { +// FilterSystemTags removes system-managed tags from the resource's tag collection +// to prevent the controller from attempting to manage them. This includes: +// - Tags with keys starting with "aws:" (AWS-managed system tags) +// - Tags specified via the --resource-tags startup flag (controller-level tags) +// - Tags injected by AWS services (e.g., CloudFormation, EKS, etc.) +// +// This filtering is essential because: +// 1. AWS services automatically add system tags that cannot be modified by users +// 2. Attempting to remove these tags would result in API errors +// 3. The controller should only manage user-defined tags, not system tags +// +// Must be called after each Read operation to ensure the resource state +// reflects only manageable tags. This prevents unnecessary update attempts +// and maintains consistency between desired and actual resource state. +// +// Example system tags that are filtered: +// - aws:cloudformation:stack-name (CloudFormation) +// - aws:eks:cluster-name (EKS) +// - services.k8s.aws/* (Kubernetes-managed) +func (rm *resourceManager) FilterSystemTags(res acktypes.AWSResource, systemTags []string) { r := rm.concreteResource(res) if r == nil || r.ko == nil { return @@ -311,7 +324,7 @@ func (rm *resourceManager) FilterSystemTags(res acktypes.AWSResource) { var existingTags []*svcapitypes.Tag existingTags = r.ko.Spec.Tags resourceTags, tagKeyOrder := convertToOrderedACKTags(existingTags) - ignoreSystemTags(resourceTags) + ignoreSystemTags(resourceTags, systemTags) r.ko.Spec.Tags = fromACKTags(resourceTags, tagKeyOrder) } diff --git a/pkg/resource/collection/tags.go b/pkg/resource/collection/tags.go index 46e42be..8e08633 100644 --- a/pkg/resource/collection/tags.go +++ b/pkg/resource/collection/tags.go @@ -25,9 +25,8 @@ import ( ) var ( - _ = svcapitypes.Collection{} - _ = acktags.NewTags() - ACKSystemTags = []string{"services.k8s.aws/namespace", "services.k8s.aws/controller-version"} + _ = svcapitypes.Collection{} + _ = acktags.NewTags() ) // convertToOrderedACKTags converts the tags parameter into 'acktags.Tags' shape. @@ -79,13 +78,14 @@ func fromACKTags(tags acktags.Tags, keyOrder []string) []*svcapitypes.Tag { } // ignoreSystemTags ignores tags that have keys that start with "aws:" -// and ACKSystemTags, to avoid patching them to the resourceSpec. +// and systemTags defined on startup via the --resource-tags flag, +// to avoid patching them to the resourceSpec. // Eg. resources created with cloudformation have tags that cannot be // removed by an ACK controller -func ignoreSystemTags(tags acktags.Tags) { +func ignoreSystemTags(tags acktags.Tags, systemTags []string) { for k := range tags { if strings.HasPrefix(k, "aws:") || - slices.Contains(ACKSystemTags, k) { + slices.Contains(systemTags, k) { delete(tags, k) } } diff --git a/pkg/resource/security_policy/manager.go b/pkg/resource/security_policy/manager.go index a979387..d698eaa 100644 --- a/pkg/resource/security_policy/manager.go +++ b/pkg/resource/security_policy/manager.go @@ -287,13 +287,26 @@ func (rm *resourceManager) EnsureTags( return nil } -// FilterAWSTags ignores tags that have keys that start with "aws:" -// is needed to ensure the controller does not attempt to remove -// tags set by AWS. This function needs to be called after each Read -// operation. -// Eg. resources created with cloudformation have tags that cannot be -// removed by an ACK controller -func (rm *resourceManager) FilterSystemTags(res acktypes.AWSResource) { +// FilterSystemTags removes system-managed tags from the resource's tag collection +// to prevent the controller from attempting to manage them. This includes: +// - Tags with keys starting with "aws:" (AWS-managed system tags) +// - Tags specified via the --resource-tags startup flag (controller-level tags) +// - Tags injected by AWS services (e.g., CloudFormation, EKS, etc.) +// +// This filtering is essential because: +// 1. AWS services automatically add system tags that cannot be modified by users +// 2. Attempting to remove these tags would result in API errors +// 3. The controller should only manage user-defined tags, not system tags +// +// Must be called after each Read operation to ensure the resource state +// reflects only manageable tags. This prevents unnecessary update attempts +// and maintains consistency between desired and actual resource state. +// +// Example system tags that are filtered: +// - aws:cloudformation:stack-name (CloudFormation) +// - aws:eks:cluster-name (EKS) +// - services.k8s.aws/* (Kubernetes-managed) +func (rm *resourceManager) FilterSystemTags(res acktypes.AWSResource, systemTags []string) { }