[jesusr@camaro ocp-release-operator-sdk{release-4.12}]$ ./UPSTREAM-MERGE.sh v1.25.4 release-4.12
Already on 'release-4.12'
Your branch is up to date with 'openshift/release-4.12'.
Already up to date.
Switched to a new branch 'v1.25.4-rebase-release-4.12'
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Jesus M. Rodriguez jmrodri
jmrodri
/ gist:c65e8ed6f82160d1127554f5046b2564
Created
March 11, 2023 05:50
kubectl-describe-pods.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ``` | |
| Name: api-86d47df589-mwf8d | |
| Namespace: default | |
| Priority: 0 | |
| Service Account: default | |
| Node: kind-control-plane/172.26.0.2 | |
| Start Time: Sat, 11 Mar 2023 00:47:11 -0500 | |
| Labels: io.kompose.network/convert-default=true | |
| io.kompose.service=api | |
| pod-template-hash=86d47df589 |
jmrodri
/ gist:c70b22011ef3c18be106bf617e552e2f
Created
March 11, 2023 05:08
docker-compose -> kube via kompose
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ``` | |
| $ k get all | |
| NAME READY STATUS RESTARTS AGE | |
| pod/agent-5fd69bbb89-clfzt 0/1 Error 0 68s | |
| pod/api-86d47df589-tvj5r 0/1 ContainerCreating 0 68s | |
| pod/elasticsearch-75d8d98855-h2gkb 0/1 ContainerCreating 0 68s | |
| pod/kibana-77b8d6fb4d-rmbhq 1/1 Running 0 68s | |
| pod/locust-b5446b4b9-cltk9 0/1 Error 0 68s | |
| pod/postgres-66fd8fcc6b-9bn7p 0/1 ContainerCreating 0 68s | |
| pod/redis-6fc4fd44fc-gkz8t 1/1 Running 0 68s |
jmrodri
/ upstream-merge.md
Created
January 27, 2023 04:47
jmrodri
/ gist:89f9c007da341b5142f13c76222b11a5
Last active
January 27, 2023 04:26
CONFLICT (content): Merge conflict in testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml
Auto-merging testdata/go/v3/memcached-operator/bundle/tests/scorecard/config.yaml
CONFLICT (content): Merge conflict in testdata/go/v3/memcached-operator/bundle/tests/scorecard/config.yaml
Auto-merging testdata/go/v3/memcached-operator/config/scorecard/patches/basic.config.yaml
CONFLICT (content): Merge conflict in testdata/go/v3/memcached-operator/config/scorecard/patches/basic.config.yaml
Auto-merging testdata/go/v3/memcached-operator/config/scorecard/patches/olm.config.yaml
CONFLICT (content): Merge conflict in testdata/go/v3/memcached-operator/config/scorecard/patches/olm.config.yaml
Auto-merging testdata/go/v4-alpha/memcached-operator/bundle/tests/scorecard/config.yaml
CONFLICT (content): Merge conflict in testdata/go/v4-alpha/memcached-operator/bundle/tests/scorecard/config.yaml
jmrodri
/ keybase.md
Created
November 17, 2022 04:09
I hereby claim:
- I am jmrodri on github.
- I am jmrodri (https://keybase.io/jmrodri) on keybase.
- I have a public key ASBBi7ccOGNNmudQDSUAi-JDfpWWd-gEr74arW6X_U2aMwo
To claim this, I am signing this object:
jmrodri
/ gist:a11c6dfdae4e582c65582bca694dac94
Created
February 23, 2022 20:57
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| cmd/operator-verify/manifests/cmd.go:58: nonEmptyResults := []errors.ManifestResult{} | |
| pkg/validation/internal/crd_test.go:65: results := []errors.ManifestResult{} | |
| pkg/validation/internal/package_manifest.go:24: result := errors.ManifestResult{Name: pkg.PackageName} | |
| pkg/validation/internal/operatorhub.go:190: result := errors.ManifestResult{Name: bundle.Name} | |
| pkg/validation/internal/community.go:73: result := errors.ManifestResult{Name: bundle.Name} | |
| pkg/validation/internal/csv.go:34: result := errors.ManifestResult{Name: csv.GetName()} | |
| pkg/validation/internal/csv.go:71: result := errors.ManifestResult{} | |
| pkg/validation/internal/good_practices.go:33: result := errors.ManifestResult{} | |
| pkg/validation/internal/removed_apis.go:75: result := errors.ManifestResult{} |
jmrodri
/ gist:1e73045cee3365ff2d56a1951500a6ea
Created
February 17, 2022 18:46
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| /usr/lib/golang/pkg/tool/linux_amd64/compile -o $WORK/b176/_pkg_.a -trimpath "$WORK/b176=>" -shared -p k8s.io/api/apps/v1 -complete -installsuffix shared -buildid z2u3wwyu2_Z9Myn-1Tai/z2u3wwyu2_Z9Myn-1Tai -goversion go1.17.5 -importcfg $WORK/b176/importcfg -pack /home/devel/jesusr/dev/src/k8s.io/api/apps/v1/doc.go /home/devel/jesusr/dev/src/k8s.io/api/apps/v1/generated.pb.go /home/devel/jesusr/dev/src/k8s.io/api/apps/v1/register.go /home/devel/jesusr/dev/src/k8s.io/api/apps/v1/types.go /home/devel/jesusr/dev/src/k8s.io/api/apps/v1/types_swagger_doc_generated.go /home/devel/jesusr/dev/src/k8s.io/api/apps/v1/zz_generated.deepcopy.go | |
| /usr/lib/golang/pkg/tool/linux_amd64/buildid -w $WORK/b271/_pkg_.a # internal | |
| cp $WORK/b271/_pkg_.a /home/devel/jesusr/.cache/go-build/fe/fea55c5641ff681995621725d2bff77bc0e91c5eefe44e975e21c5c0f865f43c-d # internal | |
| # github.com/operator-framework/api/pkg/operators/v1 | |
| _build/src/github.com/operator-framework/api/pkg/operators/v1/olmconfig_types.go:30:15: undefined: "k8s.io/apimachin |
jmrodri
/ sdk-build.txt
Created
February 15, 2022 04:03
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| setting SOURCE_DATE_EPOCH=1644796800 | |
| Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.Dd2sXf | |
| + umask 022 | |
| + cd /home/devel/jesusr/rpmbuild/BUILD | |
| + cd /home/devel/jesusr/rpmbuild/BUILD | |
| + rm -rf operator-sdk-1.17.0 | |
| + /usr/bin/gzip -dc /home/devel/jesusr/rpmbuild/SOURCES/operator-sdk-1.17.0.tar.gz | |
| + /usr/bin/tar -xof - | |
| + STATUS=0 | |
| + '[' 0 -ne 0 ']' |
jmrodri
/ golang-github-operator-framework-sdk.spec
Created
February 15, 2022 03:34
Spec file for operator-sdk generate from go2rpm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # Generated by go2rpm 1.6.0 | |
| %bcond_without check | |
| # https://github.com/operator-framework/operator-sdk | |
| %global goipath github.com/operator-framework/operator-sdk | |
| Version: 1.17.0 | |
| %gometa | |
| %global common_description %{expand: |
jmrodri
/ jokes.cache.zeusville.com-v1.yml
Created
August 26, 2021 01:02
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # Generated by Fabric8 CRDGenerator, manual edits might get overwritten! | |
| apiVersion: apiextensions.k8s.io/v1 | |
| kind: CustomResourceDefinition | |
| metadata: | |
| name: jokes.cache.zeusville.com | |
| spec: | |
| group: cache.zeusville.com | |
| names: | |
| kind: Joke | |
| plural: jokes |
NewerOlder