Skip to content

Commit 9640319

Browse files
Rakshitha-Kamathandrewschoen
Rakshitha-Kamath
authored and
andrewschoen
committed
Fix all the violations and warnings
Signed-off-by: Rakshitha-Kamath <[email protected]>
1 parent bf52193 commit 9640319

File tree

7 files changed

+1243
-15
lines changed

7 files changed

+1243
-15
lines changed

‎.tekton/snmp-notifier-pull-request.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
build.appstudio.redhat.com/commit_sha: '{{revision}}'
77
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
88
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
9-
pipelinesascode.tekton.dev/cancel-in-progress: "true"
9+
pipelinesascode.tekton.dev/cancel-in-progress: "false"
1010
pipelinesascode.tekton.dev/max-keep-runs: "3"
1111
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "release-9.0"
1212
creationTimestamp:
@@ -24,8 +24,6 @@ spec:
2424
value: '{{revision}}'
2525
- name: output-image
2626
value: quay.io/rhceph-ci/snmp-notifier:on-pr-v9.0-{{revision}}
27-
- name: image-expires-after
28-
value: 5d
2927
- name: build-platforms
3028
value:
3129
- linux/x86_64
@@ -83,19 +81,19 @@ spec:
8381
description: Skip checks against built image
8482
name: skip-checks
8583
type: string
86-
- default: "false"
84+
- default: "true"
8785
description: Execute the build with network isolation
8886
name: hermetic
8987
type: string
90-
- default: ""
88+
- default: '[{"type": "rpm", "path": "."}, {"type": "gomod", "path": "."}]'
9189
description: Build dependencies to be prefetched by Cachi2
9290
name: prefetch-input
9391
type: string
9492
- default: ""
9593
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9694
name: image-expires-after
9795
type: string
98-
- default: "false"
96+
- default: "true"
9997
description: Build a source image.
10098
name: build-source-image
10199
type: string
@@ -190,6 +188,8 @@ spec:
190188
value: $(params.output-image).prefetch
191189
- name: ociArtifactExpiresAfter
192190
value: $(params.image-expires-after)
191+
- name: ACTIVATION_KEY
192+
value: rkamath-activation-key
193193
runAfter:
194194
- clone-repository
195195
taskRef:
@@ -213,6 +213,8 @@ spec:
213213
- $(params.build-platforms)
214214
name: build-images
215215
params:
216+
- name: ACTIVATION_KEY
217+
value: rkamath-activation-key
216218
- name: IMAGE
217219
value: $(params.output-image)
218220
- name: DOCKERFILE

‎.tekton/snmp-notifier-push.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ spec:
8080
description: Skip checks against built image
8181
name: skip-checks
8282
type: string
83-
- default: "false"
83+
- default: "true"
8484
description: Execute the build with network isolation
8585
name: hermetic
8686
type: string
87-
- default: ""
87+
- default: '[{"type": "gomod", "path": "."}, {"type": "rpm", "path": "."}]'
8888
description: Build dependencies to be prefetched by Cachi2
8989
name: prefetch-input
9090
type: string

‎Dockerfile‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# Build stage 1
2-
3-
#FROM openshift/golang-builder:rhel_9_golang_1.23 AS builder
4-
FROM --platform=$BUILDPLATFORM quay.io/projectquay/golang:1.23 AS builder
2+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 AS builder
53

64
COPY snmp_notifier snmp_notifier
75

86
WORKDIR snmp_notifier
97

10-
RUN dnf install -y glibc-static
8+
#RUN dnf upgrade -y && dnf install -y \
9+
# glibc-static \
10+
# && dnf clean all && rm -rf /var/cache/yum
11+
12+
RUN dnf remove -y glibc-langpack-en && dnf install -y glibc glibc-devel glibc-static
1113

1214
# Build the binary
1315
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -mod=readonly \
@@ -30,8 +32,8 @@ RUN microdnf update -y && \
3032

3133
ENV OPBIN=/usr/local/bin/snmp_notifier
3234

33-
COPY --from=builder /go/snmp_notifier/snmp_notifier "$OPBIN"
34-
COPY --from=builder /go/snmp_notifier/description-template.tpl /etc/snmp_notifier/description-template.tpl
35+
COPY --from=builder /snmp_notifier/snmp_notifier "$OPBIN"
36+
COPY --from=builder /snmp_notifier/description-template.tpl /etc/snmp_notifier/description-template.tpl
3537

3638
LABEL maintainer="Guillaume Abrioux <[email protected]>"
3739
LABEL com.redhat.component="snmp-notifier-container"
@@ -41,9 +43,13 @@ LABEL description="SNMP Notifier container"
4143
LABEL summary="Provides snmp_notifier container."
4244
LABEL io.k8s.display-name="SNMP Notifier container"
4345
LABEL io.k8s.description="SNMP Notifier container receives alerts from the Prometheus' Alertmanager and routes them as SNMP traps."
46+
LABEL io.openshift.tags="1.2.1"
47+
LABEL cpe=cpe:/a:redhat:ceph_storage:9::el10
48+
LABEL org.opencontainers.image.created="${BUILD_DATE}"
49+
4450

4551
RUN chmod +x "$OPBIN"
4652

4753
EXPOSE 9464
4854
ENTRYPOINT ["/usr/local/bin/snmp_notifier"]
49-
CMD ["--snmp.trap-description-template=/etc/snmp_notifier/description-template.tpl"]
55+
CMD ["--snmp.trap-description-template=/etc/snmp_notifier/description-template.tpl"]

‎go.mod‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module github.com/maxwo/snmp_notifier
2+
3+
require (
4+
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
5+
github.com/cloudfoundry/gosigar v1.2.0
6+
github.com/geoffgarside/ber v1.1.0 // indirect
7+
github.com/go-ole/go-ole v1.2.4 // indirect
8+
github.com/go-test/deep v1.0.7
9+
github.com/gorilla/handlers v1.5.1
10+
github.com/k-sone/snmpgo v3.2.0+incompatible
11+
github.com/prometheus/alertmanager v0.22.2
12+
github.com/prometheus/client_golang v1.11.0
13+
github.com/prometheus/common v0.26.0
14+
github.com/shirou/gopsutil v2.20.9+incompatible
15+
gopkg.in/alecthomas/kingpin.v2 v2.2.6
16+
)
17+
18+
go 1.13

‎redhat.repo‎

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
1+
#
2+
# Certificate-Based Repositories
3+
# Managed by (rhsm) subscription-manager
4+
#
5+
# *** This file is auto-generated. Changes made here will be over-written. ***
6+
# *** Use "subscription-manager repo-override --help" if you wish to make changes. ***
7+
#
8+
# If this file is empty and this system is subscribed consider
9+
# a "yum repolist" to refresh available repos
10+
#
11+
12+
[codeready-builder-for-rhel-9-$basearch-source-rpms]
13+
name = Red Hat CodeReady Linux Builder for RHEL 9 ARM 64 (Source RPMs)
14+
baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/codeready-builder/source/SRPMS
15+
enabled = 1
16+
gpgcheck = 1
17+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
18+
sslverify = 1
19+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
20+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
21+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
22+
sslverifystatus = 1
23+
metadata_expire = 86400
24+
enabled_metadata = 0
25+
26+
[codeready-builder-for-rhel-9-$basearch-debug-rpms]
27+
name = Red Hat CodeReady Linux Builder for RHEL 9 ARM 64 (Debug RPMs)
28+
baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/codeready-builder/debug
29+
enabled = 1
30+
gpgcheck = 1
31+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
32+
sslverify = 1
33+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
34+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
35+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
36+
sslverifystatus = 1
37+
metadata_expire = 86400
38+
enabled_metadata = 0
39+
40+
[rhel-9-for-$basearch-appstream-debug-rpms]
41+
name = Red Hat Enterprise Linux 9 for ARM 64 - AppStream (Debug RPMs)
42+
baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/appstream/debug
43+
enabled = 1
44+
gpgcheck = 1
45+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
46+
sslverify = 1
47+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
48+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
49+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
50+
sslverifystatus = 1
51+
metadata_expire = 86400
52+
enabled_metadata = 0
53+
54+
[rhel-9-for-$basearch-baseos-debug-rpms]
55+
name = Red Hat Enterprise Linux 9 for ARM 64 - BaseOS (Debug RPMs)
56+
baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/baseos/debug
57+
enabled = 1
58+
gpgcheck = 1
59+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
60+
sslverify = 1
61+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
62+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
63+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
64+
sslverifystatus = 1
65+
metadata_expire = 86400
66+
enabled_metadata = 0
67+
68+
[rhel-9-for-$basearch-baseos-rpms]
69+
name = Red Hat Enterprise Linux 9 for ARM 64 - BaseOS (RPMs)
70+
baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/baseos/os
71+
enabled = 1
72+
gpgcheck = 1
73+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
74+
sslverify = 1
75+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
76+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
77+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
78+
sslverifystatus = 1
79+
metadata_expire = 86400
80+
enabled_metadata = 1
81+
82+
[rhel-9-for-$basearch-appstream-source-rpms]
83+
name = Red Hat Enterprise Linux 9 for ARM 64 - AppStream (Source RPMs)
84+
baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/appstream/source/SRPMS
85+
enabled = 1
86+
gpgcheck = 1
87+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
88+
sslverify = 1
89+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
90+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
91+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
92+
sslverifystatus = 1
93+
metadata_expire = 86400
94+
enabled_metadata = 0
95+
96+
[openstack-beta-deployment-tools-for-rhel-9-x86_64-source-rpms]
97+
name = Red Hat OpenStack Platform Beta Director Deployment Tools for RHEL 9 x86_64 (Source RPMs)
98+
baseurl = https://cdn.redhat.com/content/beta/layered/rhel9/x86_64/openstack-deployment-tools/source/SRPMS
99+
enabled = 0
100+
gpgcheck = 1
101+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta
102+
sslverify = 1
103+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
104+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
105+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
106+
sslverifystatus = 1
107+
metadata_expire = 86400
108+
enabled_metadata = 0
109+
110+
[rhel-atomic-7-cdk-3.5-debug-rpms]
111+
name = Red Hat Container Development Kit 3.5 /(Debug RPMs)
112+
baseurl = https://cdn.redhat.com/content/dist/rhel/atomic/7/7Server/$basearch/cdk/3.5/debug
113+
enabled = 0
114+
gpgcheck = 1
115+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
116+
sslverify = 1
117+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
118+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
119+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
120+
sslverifystatus = 1
121+
metadata_expire = 86400
122+
enabled_metadata = 0
123+
124+
[rhocp-ironic-4.20-for-rhel-9-$basearch-source-rpms]
125+
name = Ironic content for Red Hat OpenShift Container Platform 4.20 for RHEL 9 ARM 64 (Source RPMs)
126+
baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/$basearch/rhocp-ironic/4.20/source/SRPMS
127+
enabled = 0
128+
gpgcheck = 1
129+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
130+
sslverify = 1
131+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
132+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
133+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
134+
sslverifystatus = 1
135+
metadata_expire = 86400
136+
enabled_metadata = 0
137+
138+
[rhel-9-for-$basearch-rt-debug-rpms]
139+
name = Red Hat Enterprise Linux 9 for ARM 64 - Real Time (Debug RPMs)
140+
baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/rt/debug
141+
enabled = 0
142+
gpgcheck = 1
143+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
144+
sslverify = 1
145+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
146+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
147+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
148+
sslverifystatus = 1
149+
metadata_expire = 86400
150+
enabled_metadata = 0
151+
152+
[rhel-9-for-$basearch-appstream-rpms]
153+
name = Red Hat Enterprise Linux 9 for ARM 64 - AppStream (RPMs)
154+
baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/appstream/os
155+
enabled = 1
156+
gpgcheck = 1
157+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
158+
sslverify = 1
159+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
160+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
161+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
162+
sslverifystatus = 1
163+
metadata_expire = 86400
164+
enabled_metadata = 1
165+
166+
[rhel-9-for-$basearch-baseos-source-rpms]
167+
name = Red Hat Enterprise Linux 9 for ARM 64 - BaseOS (Source RPMs)
168+
baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/baseos/source/SRPMS
169+
enabled = 1
170+
gpgcheck = 1
171+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
172+
sslverify = 1
173+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
174+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
175+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
176+
sslverifystatus = 1
177+
metadata_expire = 86400
178+
enabled_metadata = 0
179+
180+
[codeready-builder-for-rhel-9-$basearch-rpms]
181+
name = Red Hat CodeReady Linux Builder for RHEL 9 ARM 64 (RPMs)
182+
baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/codeready-builder/os
183+
enabled = 1
184+
gpgcheck = 1
185+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
186+
sslverify = 1
187+
sslcacert = /etc/rhsm/ca/redhat-uep.pem
188+
sslclientkey = /etc/pki/entitlement/6410848555687578927-key.pem
189+
sslclientcert = /etc/pki/entitlement/6410848555687578927.pem
190+
sslverifystatus = 1
191+
metadata_expire = 86400
192+
enabled_metadata = 0

‎rpms.in.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
contentOrigin:
2+
repofiles:
3+
- ./redhat.repo
4+
context:
5+
bare: true
6+
7+
arches:
8+
- x86_64
9+
- aarch64
10+
- ppc64le
11+
- s390x
12+
13+
packages:
14+
- glibc-static
15+
16+
allowerasing: true

0 commit comments

Comments
 (0)