Skip to content

Commit acbc148

Browse files
camilamacedo86camilamacedo86
authored
update k8s 1.22 (#5228)
* bump kb and update to use k8s 1.22 and upper versions of controller-gen and controller-runtime Signed-off-by: Camila Macedo <[email protected]> * address suggestions nits Signed-off-by: Camila Macedo <[email protected]> * nit suggestions Signed-off-by: Camila Macedo <[email protected]>
1 parent aac916d commit acbc148

File tree

37 files changed

+408
-409
lines changed

37 files changed

+408
-409
lines changed

‎changelog/fragments/bump-1.22.yaml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# entries is a list of entries to include in
2+
# release notes and/or the migration guide
3+
entries:
4+
- description: >
5+
- Upgrade the Kubernetes dependencies from `1.21` to `1.22`.
6+
- Upgrade the controller-gen dependency from `v0.6.2` to `v0.7.0`. More info: https://github.com/kubernetes-sigs/controller-tools/releases
7+
- Upgrade the sigs.k8s.io/controller-runtime dependency from `v0.9.2` to `v0.10.0`. More info: https://github.com/kubernetes-sigs/controller-runtime/releases
8+
- Upgrade the Env Test used from `1.21` to `1.22`.
9+
10+
# kind is one of:
11+
# - addition
12+
# - change
13+
# - deprecation
14+
# - removal
15+
# - bugfix
16+
kind: "change"
17+
18+
# Is this a breaking change?
19+
breaking: false
20+
21+
# NOTE: ONLY USE `pull_request_override` WHEN ADDING THIS
22+
# FILE FOR A PREVIOUSLY MERGED PULL_REQUEST!
23+
#
24+
# The generator auto-detects the PR number from the commit
25+
# message in which this file was originally added.
26+
#
27+
# What is the pull request number (without the "#")?
28+
# pull_request_override: 0
29+
30+
31+
# Migration can be defined to automatically add a section to
32+
# the migration guide. This is required for breaking changes.
33+
migration:
34+
header: Upgrade K8s versions to use 1.22 (golang/v3)
35+
body: >
36+
Note that to ensure the backwards compatibility SDK tool will try to downgrade the versions used if you need to still scaffold the v1beta1 for CRDs and Webhooks to publish your solutions into older cluster versions.
37+
However, note that this version is no longer supported on Kubernetes 1.22+, and for sigs.k8s.io/controller-runtime v0.10.0 or controller-gen v0.7.0.
38+
39+
Following are the changes to be addressed in your `Makefile` and `go.mod` file if you are
40+
not using the `v1beta1` K8s APIs which are no longer supported from k8s `1.22` version.
41+
42+
1) Update your `go.mod` file to upgrade the dependencies and run `go mod tidy` to download then
43+
44+
```go
45+
k8s.io/api v0.22.1
46+
k8s.io/apimachinery v0.22.1
47+
k8s.io/client-go v0.22.1
48+
sigs.k8s.io/controller-runtime v0.10.0
49+
```
50+
51+
2) Update your Makefile by
52+
- Replacing `ENVTEST_K8S_VERSION = 1.21` with `ENVTEST_K8S_VERSION = 1.22`
53+
- Replacing `$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases` with `$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases`
54+
- Now, you can also remove from the `Makefile` the `CRD_OPTIONS`, see below:
55+
56+
```
57+
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
58+
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
59+
```
60+
61+
3) Replace your `admissionReviewVersions={v1,v1beta1}` markers with `admissionReviewVersions=v1`
62+
4) Run `make manifest` to re-generate your manifests with latest versions.

‎go.mod‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ require (
3131
golang.org/x/tools v0.1.5
3232
gomodules.xyz/jsonpatch/v3 v3.0.1
3333
helm.sh/helm/v3 v3.6.2
34-
k8s.io/api v0.22.1
35-
k8s.io/apiextensions-apiserver v0.22.1
36-
k8s.io/apimachinery v0.22.1
34+
k8s.io/api v0.22.2
35+
k8s.io/apiextensions-apiserver v0.22.2
36+
k8s.io/apimachinery v0.22.2
3737
k8s.io/cli-runtime v0.21.0
38-
k8s.io/client-go v0.22.1
38+
k8s.io/client-go v0.22.2
3939
k8s.io/kubectl v0.21.0
4040
sigs.k8s.io/controller-runtime v0.10.0
41-
sigs.k8s.io/controller-tools v0.6.2
42-
sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20210803185103-51e4a9aa5055
41+
sigs.k8s.io/controller-tools v0.7.0
42+
sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20211001202619-87eb9d55ecdc
4343
sigs.k8s.io/yaml v1.2.0
4444
)
4545

@@ -53,6 +53,7 @@ replace (
5353
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
5454
github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.10.0
5555
golang.org/x/text => golang.org/x/text v0.3.3 // Required to fix CVE-2020-14040
56+
5657
)
5758

5859
exclude github.com/spf13/viper v1.3.2 // Required to fix CVE-2018-1098

‎go.sum‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,16 +1754,18 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8=
17541754
k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU=
17551755
k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s=
17561756
k8s.io/api v0.21.3/go.mod h1:hUgeYHUbBp23Ue4qdX9tR8/ANi/g3ehylAqDn9NWVOg=
1757-
k8s.io/api v0.22.1 h1:ISu3tD/jRhYfSW8jI/Q1e+lRxkR7w9UwQEZ7FgslrwY=
17581757
k8s.io/api v0.22.1/go.mod h1:bh13rkTp3F1XEaLGykbyRD2QaTTzPm0e/BMd8ptFONY=
1758+
k8s.io/api v0.22.2 h1:M8ZzAD0V6725Fjg53fKeTJxGsJvRbk4TEm/fexHMtfw=
1759+
k8s.io/api v0.22.2/go.mod h1:y3ydYpLJAaDI+BbSe2xmGcqxiWHmWjkEeIbiwHvnPR8=
17591760
k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY=
17601761
k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk=
17611762
k8s.io/apiextensions-apiserver v0.20.6/go.mod h1:qO8YMqeMmZH+lV21LUNzV41vfpoE9QVAJRA+MNqj0mo=
17621763
k8s.io/apiextensions-apiserver v0.21.0/go.mod h1:gsQGNtGkc/YoDG9loKI0V+oLZM4ljRPjc/sql5tmvzc=
17631764
k8s.io/apiextensions-apiserver v0.21.1/go.mod h1:KESQFCGjqVcVsZ9g0xX5bacMjyX5emuWcS2arzdEouA=
17641765
k8s.io/apiextensions-apiserver v0.21.3/go.mod h1:kl6dap3Gd45+21Jnh6utCx8Z2xxLm8LGDkprcd+KbsE=
1765-
k8s.io/apiextensions-apiserver v0.22.1 h1:YSJYzlFNFSfUle+yeEXX0lSQyLEoxoPJySRupepb0gE=
17661766
k8s.io/apiextensions-apiserver v0.22.1/go.mod h1:HeGmorjtRmRLE+Q8dJu6AYRoZccvCMsghwS8XTUYb2c=
1767+
k8s.io/apiextensions-apiserver v0.22.2 h1:zK7qI8Ery7j2CaN23UCFaC1hj7dMiI87n01+nKuewd4=
1768+
k8s.io/apiextensions-apiserver v0.22.2/go.mod h1:2E0Ve/isxNl7tWLSUDgi6+cmwHi5fQRdwGVCxbC+KFA=
17671769
k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
17681770
k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
17691771
k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
@@ -1772,16 +1774,18 @@ k8s.io/apimachinery v0.21.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswP
17721774
k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
17731775
k8s.io/apimachinery v0.21.2/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM=
17741776
k8s.io/apimachinery v0.21.3/go.mod h1:H/IM+5vH9kZRNJ4l3x/fXP/5bOPJaVP/guptnZPeCFI=
1775-
k8s.io/apimachinery v0.22.1 h1:DTARnyzmdHMz7bFWFDDm22AM4pLWTQECMpRTFu2d2OM=
17761777
k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
1778+
k8s.io/apimachinery v0.22.2 h1:ejz6y/zNma8clPVfNDLnPbleBo6MpoFy/HBiBqCouVk=
1779+
k8s.io/apimachinery v0.22.2/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
17771780
k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw=
17781781
k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
17791782
k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q=
17801783
k8s.io/apiserver v0.21.0/go.mod h1:w2YSn4/WIwYuxG5zJmcqtRdtqgW/J2JRgFAqps3bBpg=
17811784
k8s.io/apiserver v0.21.1/go.mod h1:nLLYZvMWn35glJ4/FZRhzLG/3MPxAaZTgV4FJZdr+tY=
17821785
k8s.io/apiserver v0.21.3/go.mod h1:eDPWlZG6/cCCMj/JBcEpDoK+I+6i3r9GsChYBHSbAzU=
1783-
k8s.io/apiserver v0.22.1 h1:Ul9Iv8OMB2s45h2tl5XWPpAZo1VPIJ/6N+MESeed7L8=
17841786
k8s.io/apiserver v0.22.1/go.mod h1:2mcM6dzSt+XndzVQJX21Gx0/Klo7Aen7i0Ai6tIa400=
1787+
k8s.io/apiserver v0.22.2 h1:TdIfZJc6YNhu2WxeAOWq1TvukHF0Sfx0+ln4XK9qnL4=
1788+
k8s.io/apiserver v0.22.2/go.mod h1:vrpMmbyjWrgdyOvZTSpsusQq5iigKNWv9o9KlDAbBHI=
17851789
k8s.io/cli-runtime v0.20.6/go.mod h1:JVERW478qcxWrUjJuWQSqyJeiz9QC4T6jmBznHFBC8w=
17861790
k8s.io/cli-runtime v0.21.0 h1:/V2Kkxtf6x5NI2z+Sd/mIrq4FQyQ8jzZAUD6N5RnN7Y=
17871791
k8s.io/cli-runtime v0.21.0/go.mod h1:XoaHP93mGPF37MkLbjGVYqg3S1MnsFdKtiA/RZzzxOo=
@@ -1791,23 +1795,26 @@ k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0=
17911795
k8s.io/client-go v0.21.0/go.mod h1:nNBytTF9qPFDEhoqgEPaarobC8QPae13bElIVHzIglA=
17921796
k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs=
17931797
k8s.io/client-go v0.21.3/go.mod h1:+VPhCgTsaFmGILxR/7E1N0S+ryO010QBeNCv5JwRGYU=
1794-
k8s.io/client-go v0.22.1 h1:jW0ZSHi8wW260FvcXHkIa0NLxFBQszTlhiAVsU5mopw=
17951798
k8s.io/client-go v0.22.1/go.mod h1:BquC5A4UOo4qVDUtoc04/+Nxp1MeHcVc1HJm1KmG8kk=
1799+
k8s.io/client-go v0.22.2 h1:DaSQgs02aCC1QcwUdkKZWOeaVsQjYvWv8ZazcZ6JcHc=
1800+
k8s.io/client-go v0.22.2/go.mod h1:sAlhrkVDf50ZHx6z4K0S40wISNTarf1r800F+RlCF6U=
17961801
k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
17971802
k8s.io/code-generator v0.20.1/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
17981803
k8s.io/code-generator v0.20.6/go.mod h1:i6FmG+QxaLxvJsezvZp0q/gAEzzOz3U53KFibghWToU=
17991804
k8s.io/code-generator v0.21.0/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
18001805
k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
18011806
k8s.io/code-generator v0.21.3/go.mod h1:K3y0Bv9Cz2cOW2vXUrNZlFbflhuPvuadW6JdnN6gGKo=
18021807
k8s.io/code-generator v0.22.1/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o=
1808+
k8s.io/code-generator v0.22.2/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o=
18031809
k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM=
18041810
k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk=
18051811
k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM=
18061812
k8s.io/component-base v0.21.0/go.mod h1:qvtjz6X0USWXbgmbfXR+Agik4RZ3jv2Bgr5QnZzdPYw=
18071813
k8s.io/component-base v0.21.1/go.mod h1:NgzFZ2qu4m1juby4TnrmpR8adRk6ka62YdH5DkIIyKA=
18081814
k8s.io/component-base v0.21.3/go.mod h1:kkuhtfEHeZM6LkX0saqSK8PbdO7A0HigUngmhhrwfGQ=
1809-
k8s.io/component-base v0.22.1 h1:SFqIXsEN3v3Kkr1bS6rstrs1wd45StJqbtgbQ4nRQdo=
18101815
k8s.io/component-base v0.22.1/go.mod h1:0D+Bl8rrnsPN9v0dyYvkqFfBeAd4u7n77ze+p8CMiPo=
1816+
k8s.io/component-base v0.22.2 h1:vNIvE0AIrLhjX8drH0BgCNJcR4QZxMXcJzBsDplDx9M=
1817+
k8s.io/component-base v0.22.2/go.mod h1:5Br2QhI9OTe79p+TzPe9JKNQYvEKbq9rTJDWllunGug=
18111818
k8s.io/component-helpers v0.20.6/go.mod h1:d4rFhZS/wxrZCxRiJJiWf1mVGVeMB5/ey3Yv8/rOp78=
18121819
k8s.io/component-helpers v0.21.0/go.mod h1:tezqefP7lxfvJyR+0a+6QtVrkZ/wIkyMLK4WcQ3Cj8U=
18131820
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
@@ -1840,8 +1847,9 @@ k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl
18401847
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
18411848
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
18421849
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
1843-
k8s.io/utils v0.0.0-20210802155522-efc7438f0176 h1:Mx0aa+SUAcNRQbs5jUzV8lkDlGFU8laZsY9jrcVX5SY=
18441850
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
1851+
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a h1:8dYfu/Fc9Gz2rNJKB9IQRGgQOh2clmRzNIPPY1xLY5g=
1852+
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
18451853
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
18461854
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
18471855
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
@@ -1857,12 +1865,13 @@ sigs.k8s.io/controller-runtime v0.10.0 h1:HgyZmMpjUOrtkaFtCnfxsR1bGRuFoAczSNbn2M
18571865
sigs.k8s.io/controller-runtime v0.10.0/go.mod h1:GCdh6kqV6IY4LK0JLwX0Zm6g233RtVGdb/f0+KSfprg=
18581866
sigs.k8s.io/controller-tools v0.4.1/go.mod h1:G9rHdZMVlBDocIxGkK3jHLWqcTMNvveypYJwrvYKjWU=
18591867
sigs.k8s.io/controller-tools v0.6.0/go.mod h1:baRMVPrctU77F+rfAuH2uPqW93k6yQnZA2dhUOr7ihc=
1860-
sigs.k8s.io/controller-tools v0.6.2 h1:+Y8L0UsAugDipGRw8lrkPoAi6XqlQVZuf1DQHME3PgU=
18611868
sigs.k8s.io/controller-tools v0.6.2/go.mod h1:oaeGpjXn6+ZSEIQkUe/+3I40PNiDYp9aeawbt3xTgJ8=
1869+
sigs.k8s.io/controller-tools v0.7.0 h1:iZIz1vEcavyEfxjcTLs1WH/MPf4vhPCtTKhoHqV8/G0=
1870+
sigs.k8s.io/controller-tools v0.7.0/go.mod h1:bpBAo0VcSDDLuWt47evLhMLPxRPxMDInTEH/YbdeMK0=
18621871
sigs.k8s.io/kind v0.10.0/go.mod h1:fb32zUw7ewC47bPwLnwhf47wd/vADtv3c38KP7sjIlo=
18631872
sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20210702145813-742983631190/go.mod h1:pUhjQx9f/+cn1OtSa5zMohY1lgk9s/9Mbcvwj82lrNk=
1864-
sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20210803185103-51e4a9aa5055 h1:3f5m0xp0DEsg+Sdrt1Rld8TCEFOH5GKsoYrEpdOzA+s=
1865-
sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20210803185103-51e4a9aa5055/go.mod h1:pUhjQx9f/+cn1OtSa5zMohY1lgk9s/9Mbcvwj82lrNk=
1873+
sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20211001202619-87eb9d55ecdc h1:7HqFWk9fT5OfkZvY2CVHVrkRZAgS7n9rqsISG64/958=
1874+
sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20211001202619-87eb9d55ecdc/go.mod h1:I7A2uB9NFAENStOGkI96dvx9D0uPH2uAiwjSQcyFSkU=
18661875
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
18671876
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
18681877
sigs.k8s.io/kustomize/api v0.8.5 h1:bfCXGXDAbFbb/Jv5AhMj2BB8a5VAJuuQ5/KU69WtDjQ=

‎hack/generate/samples/internal/ansible/advanced_molecule.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222

2323
log "github.com/sirupsen/logrus"
24-
kbtestutils "sigs.k8s.io/kubebuilder/v3/test/e2e/utils"
24+
kbutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util"
2525

2626
"github.com/operator-framework/operator-sdk/hack/generate/samples/internal/pkg"
2727
"github.com/operator-framework/operator-sdk/internal/util"
@@ -98,23 +98,23 @@ func (ma *AdvancedMolecule) Run() {
9898
data:
9999
sentinel: '{{ sentinel }}'
100100
groups: '{{ groups | to_nice_yaml }}'`
101-
err = util.ReplaceInFile(
101+
err = kbutil.ReplaceInFile(
102102
inventoryRoleTask,
103103
"# tasks file for InventoryTest",
104104
inventoryRoleTaskFragment)
105105
pkg.CheckError("replacing inventory task", err)
106106

107107
log.Infof("updating inventorytest sample")
108-
err = util.ReplaceInFile(
108+
err = kbutil.ReplaceInFile(
109109
filepath.Join(ma.ctx.Dir, "config", "samples", "test_v1alpha1_inventorytest.yaml"),
110110
"name: inventorytest-sample",
111111
inventorysampleFragment)
112112
pkg.CheckError("updating inventorytest sample", err)
113113

114114
log.Infof("updating spec of inventorytest sample")
115-
err = util.ReplaceInFile(
115+
err = kbutil.ReplaceInFile(
116116
filepath.Join(ma.ctx.Dir, "config", "samples", "test_v1alpha1_inventorytest.yaml"),
117-
"foo: bar",
117+
"# Add fields here",
118118
"size: 3")
119119
pkg.CheckError("updating spec of inventorytest sample", err)
120120

@@ -156,7 +156,7 @@ func (ma *AdvancedMolecule) updateConfig() {
156156
- update
157157
- watch
158158
#+kubebuilder:scaffold:rules`
159-
err := util.ReplaceInFile(
159+
err := kbutil.ReplaceInFile(
160160
filepath.Join(ma.ctx.Dir, "config", "rbac", "role.yaml"),
161161
"#+kubebuilder:scaffold:rules",
162162
cmRolesFragment)
@@ -165,7 +165,7 @@ func (ma *AdvancedMolecule) updateConfig() {
165165
log.Infof("adding manager arg")
166166
const ansibleVaultArg = `
167167
- --ansible-args='--vault-password-file /opt/ansible/pwd.yml'`
168-
err = kbtestutils.InsertCode(
168+
err = kbutil.InsertCode(
169169
filepath.Join(ma.ctx.Dir, "config", "manager", "manager.yaml"),
170170
"- --leader-election-id=advanced-molecule-operator",
171171
ansibleVaultArg)
@@ -177,7 +177,7 @@ func (ma *AdvancedMolecule) updateConfig() {
177177
value: "TRUE"
178178
- name: ANSIBLE_INVENTORY
179179
value: /opt/ansible/inventory`
180-
err = kbtestutils.InsertCode(
180+
err = kbutil.InsertCode(
181181
filepath.Join(ma.ctx.Dir, "config", "manager", "manager.yaml"),
182182
"value: explicit",
183183
managerEnv)
@@ -186,14 +186,14 @@ func (ma *AdvancedMolecule) updateConfig() {
186186
log.Infof("adding vaulting args to the proxy auth")
187187
const managerAuthArgs = `
188188
- "--ansible-args='--vault-password-file /opt/ansible/pwd.yml'"`
189-
err = kbtestutils.InsertCode(
189+
err = kbutil.InsertCode(
190190
filepath.Join(ma.ctx.Dir, "config", "default", "manager_auth_proxy_patch.yaml"),
191191
"- \"--leader-elect\"",
192192
managerAuthArgs)
193193
pkg.CheckError("adding vaulting args to the proxy auth", err)
194194

195195
log.Infof("adding task to not pull image to the config/testing")
196-
err = util.ReplaceInFile(
196+
err = kbutil.ReplaceInFile(
197197
filepath.Join(ma.ctx.Dir, "config", "testing", "kustomization.yaml"),
198198
"- manager_image.yaml",
199199
"- manager_image.yaml\n- pull_policy/Never.yaml")
@@ -261,7 +261,7 @@ RUN ansible-galaxy collection build /tmp/fixture_collection/ --output-path /tmp/
261261
RUN echo abc123 > /opt/ansible/pwd.yml \
262262
&& ansible-vault encrypt_string --vault-password-file /opt/ansible/pwd.yml 'thisisatest' --name 'the_secret' > /opt/ansible/vars.yml
263263
`
264-
err = kbtestutils.InsertCode(
264+
err = kbutil.InsertCode(
265265
filepath.Join(ma.ctx.Dir, "Dockerfile"),
266266
"COPY playbooks/ ${HOME}/playbooks/",
267267
dockerfileFragment)
@@ -291,7 +291,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
291291
data:
292292
msg: The decrypted value is {{the_secret.the_secret}}
293293
`
294-
err := util.ReplaceInFile(
294+
err := kbutil.ReplaceInFile(
295295
filepath.Join(ma.ctx.Dir, "playbooks", "argstest.yml"),
296296
originalPlaybookFragment,
297297
argsPlaybook)
@@ -315,7 +315,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
315315
data:
316316
shouldBeCamel: '{{ camelCaseVar | default("false") }}'
317317
`
318-
err = util.ReplaceInFile(
318+
err = kbutil.ReplaceInFile(
319319
filepath.Join(ma.ctx.Dir, "playbooks", "casetest.yml"),
320320
originalPlaybookFragment,
321321
casePlaybook)
@@ -334,7 +334,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
334334
tasks:
335335
- command: echo hello
336336
- debug: msg='{{ "hello" | test }}'`
337-
err = util.ReplaceInFile(
337+
err = kbutil.ReplaceInFile(
338338
filepath.Join(ma.ctx.Dir, "playbooks", "inventorytest.yml"),
339339
"---\n- hosts: localhost\n gather_facts: no\n collections:\n - community.kubernetes\n - operator_sdk.util\n tasks:\n - import_role:\n name: \"inventorytest\"",
340340
inventoryPlaybook)
@@ -392,7 +392,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
392392
time: 1s
393393
when: configmap.resources|length > 0 and (configmap.resources.0.data.iterations|int) < 5
394394
`
395-
err = util.ReplaceInFile(
395+
err = kbutil.ReplaceInFile(
396396
filepath.Join(ma.ctx.Dir, "playbooks", "reconciliationtest.yml"),
397397
originalPlaybookFragment,
398398
reconciliationPlaybook)
@@ -416,7 +416,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
416416
data:
417417
hello: "world"
418418
`
419-
err = util.ReplaceInFile(
419+
err = kbutil.ReplaceInFile(
420420
filepath.Join(ma.ctx.Dir, "playbooks", "selectortest.yml"),
421421
originalPlaybookFragment,
422422
selectorPlaybook)
@@ -475,7 +475,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
475475
execCommandStderr: '{{ exec_result.stderr.strip() }}'
476476
logs: '{{ log_result.log }}'
477477
`
478-
err = util.ReplaceInFile(
478+
err = kbutil.ReplaceInFile(
479479
filepath.Join(ma.ctx.Dir, "playbooks", "subresourcestest.yml"),
480480
originalPlaybookFragment,
481481
subresourcesPlaybook)
@@ -510,7 +510,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
510510
data:
511511
foo: bar
512512
`
513-
err = util.ReplaceInFile(
513+
err = kbutil.ReplaceInFile(
514514
filepath.Join(ma.ctx.Dir, "playbooks", "clusterannotationtest.yml"),
515515
originalPlaybookFragment,
516516
clusterAnnotationTest)
@@ -544,7 +544,7 @@ func (ma *AdvancedMolecule) addPlaybooks() {
544544
task := fmt.Sprintf("%s_test.yml", k)
545545
logMsgForKind = fmt.Sprintf("removing FIXME assert from %s", task)
546546
log.Infof(logMsgForKind)
547-
err = util.ReplaceInFile(
547+
err = kbutil.ReplaceInFile(
548548
filepath.Join(ma.ctx.Dir, "molecule", "default", "tasks", task),
549549
fixmeAssert,
550550
"")

0 commit comments

Comments
 (0)