Merge pull request #38 from aaronfern/cve_and_entrypoint

Updated entry point for etcd-custom-image and added CVE categorisation labels
gardener · Jul 28, 2023 · f6a7b7c · f6a7b7c
2 parents 29b0ed0 + eed6104
commit f6a7b7c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions
@@ -26,6 +26,15 @@ etcd-custom-image:
               inputs:
                 repos:
                   source: ~
+              resource_labels:
+              - name: 'gardener.cloud/cve-categorisation'
+                value:
+                  network_exposure: 'private'
+                  authentication_enforced: true
+                  user_interaction: 'gardener-operator'
+                  confidentiality_requirement: 'high'
+                  integrity_requirement: 'high'
+                  availability_requirement: 'high'
         release:
           nextversion: noop
           release_commit_publishing_policy: tag_only

diff --git a/Dockerfile b/Dockerfile
@@ -16,4 +16,4 @@ COPY --from=source /usr/local/bin/etcd /usr/local/bin
 COPY --from=source /usr/local/bin/etcdctl /usr/local/bin
 COPY etcd_bootstrap_script.sh /var/etcd/bin/bootstrap.sh
 
-ENTRYPOINT ["/usr/local/bin/etcd"]
+ENTRYPOINT ["/var/etcd/bin/bootstrap.sh"]
diff --git a/Dockerfile-e b/Dockerfile-e
@@ -11,4 +11,4 @@ RUN apk add --update bash curl wget openssl
 COPY --from=source /usr/local/bin/etcd /usr/local/bin
 COPY --from=source /usr/local/bin/etcdctl /usr/local/bin
 
-ENTRYPOINT ["/usr/local/bin/etcd"]
+ENTRYPOINT ["/var/etcd/bin/bootstrap.sh"]
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -16,4 +16,4 @@ COPY --from=source /usr/local/bin/etcd /usr/local/bin
 COPY --from=source /usr/local/bin/etcdctl /usr/local/bin
 COPY etcd_bootstrap_script.sh /var/etcd/bin/bootstrap.sh
 
-ENTRYPOINT ["/usr/local/bin/etcd"]
+ENTRYPOINT ["/var/etcd/bin/bootstrap.sh"]
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v3.4.13-bootstrap-11
+v3.4.13-bootstrap-12